summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1383 from brenton/bz1306665Brenton Leanhardt2016-02-111-1/+1
|\ | | | | Bug 1306665 - [metrics] update metrics-deployer template to use lates…
| * Bug 1306665 - [metrics] update metrics-deployer template to use latest image ↵Brenton Leanhardt2016-02-111-1/+1
|/ | | | versions
* Merge pull request #1367 from detiber/githubOrgBrenton Leanhardt2016-02-111-7/+20
|\ | | | | Add organizations attribute to github identity provider
| * Add organizations attribute to github identity providerJason DeTiberus2016-02-101-7/+20
| | | | | | | | - also fix location of mappingMethod in identityProviders config
* | Merge pull request #1380 from joelddiaz/zbx-action-user-diffJoel Diaz2016-02-101-2/+2
|\ \ | | | | | | use correct dict key
| * | use correct dict keyJoel Diaz2016-02-101-2/+2
|/ /
* | Merge pull request #1379 from joelddiaz/zbx-action-diffJoel Diaz2016-02-101-6/+6
|\ \ | | | | | | handle being passed an empty group list
| * | handle being passed an empty group listJoel Diaz2016-02-101-6/+6
| | | | | | | | | | | | | | | Previous version would have the behavior where when an empty list is passed, the zbx API call would return a list of all groups. So an action with no groups defined would default to having all groups added to the operations. Handle this by iterating one at a time through the list of provided groups. When an empty list is provided, and empty list is returned.
* | | Merge pull request #1363 from vishpat/kubeproxyBrenton Leanhardt2016-02-102-0/+4
|\ \ \ | | | | | | | | Enable selection of kubeproxy mode
| * | | Enable selection of kubeproxy modeVishal Patil2016-02-102-0/+4
| | |/ | |/| | | | | | | Addressed review comments
* | | Merge pull request #1370 from vanveele/iscsi-pluginBrenton Leanhardt2016-02-105-4/+12
|\ \ \ | | | | | | | | add iscsi storage_plugin dependency
| * | | add default storage plugins to 'origin' deployment_typeRobert van Veelen2016-02-101-1/+1
| | | |
| * | | update defaults and examples w/ iscsi pluginRobert van Veelen2016-02-103-3/+3
| | | |
| * | | add iscsi storage_plugin dependencyRobert van Veelen2016-02-102-0/+8
| | | |
* | | | Merge pull request #1326 from detiber/bz1303939Brenton Leanhardt2016-02-1010-75/+87
|\ \ \ \ | |_|_|/ |/| | | Fix infra_node deployment
| * | | fix default valueJason DeTiberus2016-02-101-1/+1
| | | |
| * | | add missing connection:localJason DeTiberus2016-02-091-0/+1
| | | |
| * | | consolidate oo_first_master post-config a bit, fix some roles that use ↵Jason DeTiberus2016-02-096-45/+31
| | | | | | | | | | | | | | | | openshift_facts without declaring a dependency
| * | | openshift_serviceaccounts updatesJason DeTiberus2016-02-094-41/+60
| | | | | | | | | | | | | | | | | | | | - make service account creation more flexible - create service accounts near where they are consumed
| * | | Fix infra_node deploymentJason DeTiberus2016-02-091-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not deploy the router/registry when the infra_nodes variable is present but does not contain a list of infra nodes. - use right node group and only set openshift_infra_nodes if group is present
* | | | Merge pull request #1374 from joelddiaz/ovs-trigger-calcJoel Diaz2016-02-101-2/+2
|\ \ \ \ | | | | | | | | | | trigger on two successive bad pid counts
| * | | | trigger on two successive bad pid countsJoel Diaz2016-02-101-2/+2
| | | | |
* | | | | Merge pull request #1375 from stenwt/sturpin-2016-02-10-notnotschedSten Turpin2016-02-101-7/+0
|\ \ \ \ \ | | | | | | | | | | | | removed notscheduleable trigger, it just makes noise in its current i…
| * | | | | removed notscheduleable trigger, it just makes noise in its current incarnationSten Turpin2016-02-101-7/+0
|/ / / / /
* | | | | Merge pull request #1373 from stenwt/sturpin-2016-02-09-registry-health-fixedSten Turpin2016-02-101-4/+4
|\ \ \ \ \ | | | | | | | | | | | | added nodes not ready and nodes not schedulable triggers
| * | | | | added nodes not ready and nodes not schedulable triggersSten Turpin2016-02-101-4/+4
| | | | | |
* | | | | | Merge pull request #1359 from rharrison10/rharriso/dynRussell Harrison2016-02-102-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix a bug with existing CNAME records
| * | | | | Fix a bug with existing CNAME recordsRussell Harrison2016-02-092-1/+5
| | | | | |
* | | | | | Merge pull request #1371 from abutcher/mask-atomicBrenton Leanhardt2016-02-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't mask master service on atomic.
| * | | | | | Don't mask master service on atomic.Andrew Butcher2016-02-101-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1372 from stenwt/sturpin-2016-02-09-registry-healthSten Turpin2016-02-101-0/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | added nodes not ready and nodes not schedulable triggers
| * | | | | added nodes not ready and nodes not schedulable triggersSten Turpin2016-02-101-0/+26
|/ / / / /
* | | | | Merge pull request #1368 from detiber/gte3_2Brenton Leanhardt2016-02-1011-28/+32
|\ \ \ \ \ | |_|_|/ / |/| | | | Add gte check for 3.2, update version checks to gte
| * | | | Add gte check for 3.2, update version checks to gteJason DeTiberus2016-02-0911-28/+32
| | |_|/ | |/| |
* | | | Merge pull request #1364 from codificat/openshift-enterpriseBrenton Leanhardt2016-02-106-6/+8
|\ \ \ \ | | | | | | | | | | Add missing atomic- and openshift-enterprise
| * | | | Add missing atomic- and openshift-enterprisePep Turró Mauri2016-02-096-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some checks related to *enterprise deployments were still only looking for "enterprise" deployment_type. Update them to cover also atomic-enterprise and openshift-enterprise deployment types.
* | | | | Merge pull request #1365 from pat2man/patch-2Brenton Leanhardt2016-02-101-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Specify default namespace when creating router
| * | | | Specify default namespace when creating routerPatrick Tescher2016-02-091-0/+1
|/ / / / | | | | | | | | In case we have switched projects before running ansible.
* | | | Merge pull request #1330 from jkhelil/make-cli-pod-eviction-timeout-configurableBrenton Leanhardt2016-02-091-0/+4
|\ \ \ \ | | | | | | | | | | Make pod_eviction_timeout configurable from cli
| * | | | Make pod_eviction_timeout configurable from clijawed2016-02-041-0/+4
| | | | |
* | | | | Merge pull request #1347 from detiber/fixFirewallBrenton Leanhardt2016-02-091-16/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix enabling iptables for latest rhel versions
| * | | | | Fix enabling iptables for latest rhel versionsJason DeTiberus2016-02-081-16/+16
| | | | | |
* | | | | | Merge pull request #1361 from stenwt/sturpin-2016-02-09-registry-healthSten Turpin2016-02-091-5/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | changed registry checks to alert based on number of registries with p…
| * | | | | changed registry checks to alert based on number of registries with problemsSten Turpin2016-02-091-5/+12
|/ / / / /
* | | | | Merge pull request #1356 from adellape/fix_ha_typoBrenton Leanhardt2016-02-093-9/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix HA typo in example AEP/OSE/Origin inventories
| * | | | Fix HA typo in example AEP/OSE/Origin inventoriesAlex Dellapenta2016-02-093-9/+9
|/ / / /
* | | | Merge pull request #1351 from kwoodson/create_appKenny Woodson2016-02-091-4/+4
|\ \ \ \ | | | | | | | | | | Renaming the key for app create.
| * | | | Updated the key for app createKenny Woodson2016-02-091-4/+4
|/ / / /
* | | | Automatic commit of package [openshift-ansible] release [3.0.39-1].Brenton Leanhardt2016-02-092-2/+28
| | | |
* | | | Merge pull request #1334 from brenton/bz1304150Brenton Leanhardt2016-02-093-0/+61
|\ \ \ \ | |/ / / |/| | | Bug 1304150 - Can't upgrade atomic-openshift to specified version