summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1391 from lhuard1A/labelsBrenton Leanhardt2016-02-122-0/+19
|\ | | | | Add missing `type` node labels on OpenStack and libvirt
| * Add missing `type` node labels on OpenStack and libvirtLénaïc Huard2016-02-122-0/+19
| |
* | Merge pull request #1390 from vishpat/nuage_parameter_changesBrenton Leanhardt2016-02-127-23/+23
|\ \ | | | | | | Changes for new Nuage RPMS
| * | Changes for new Nuage RPMSVishal Patil2016-02-117-23/+23
| | |
* | | Merge pull request #1362 from detiber/fixLoopbackBrenton Leanhardt2016-02-123-34/+38
|\ \ \ | |_|/ |/| | Fix loopback cluster name, context name, and user
| * | conditionalize loopback config on v >= 3.2/1.2Jason DeTiberus2016-02-113-32/+35
| | |
| * | Fix loopback cluster name, context name, and userJason DeTiberus2016-02-111-2/+3
| | |
* | | Merge pull request #1324 from abutcher/fluentd-fixesBrenton Leanhardt2016-02-1112-210/+0
|\ \ \ | | | | | | | | Remove fluentd_master and fluentd_node roles
| * | | Remove fluentd_master and fluentd_node roles.Andrew Butcher2016-02-0812-202/+0
| | | |
| * | | Remove etcd up checks from fluentd_master.Andrew Butcher2016-02-041-8/+0
| | | |
* | | | Merge pull request #1386 from detiber/pv_fixesBrenton Leanhardt2016-02-112-2/+4
|\ \ \ \ | | | | | | | | | | Fixes pv/pvc creation for latest builds
| * | | | Fixes pv/pvc creation for latest buildsJason DeTiberus2016-02-112-2/+4
|/ / / /
* | | | Merge pull request #1377 from brenton/bz1302970Brenton Leanhardt2016-02-114-22/+71
|\ \ \ \ | |_|/ / |/| | | Bug 1302970 - update script does not patch router if name is differen…
| * | | Bug 1302970 - update script does not patch router if name is different from ↵Brenton Leanhardt2016-02-114-22/+71
|/ / / | | | | | | | | | default
* | | Automatic commit of package [openshift-ansible] release [3.0.40-1].Brenton Leanhardt2016-02-112-2/+36
| | |
* | | 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