Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1391 from lhuard1A/labels | Brenton Leanhardt | 2016-02-12 | 2 | -0/+19 |
|\ | | | | | Add missing `type` node labels on OpenStack and libvirt | ||||
| * | Add missing `type` node labels on OpenStack and libvirt | Lénaïc Huard | 2016-02-12 | 2 | -0/+19 |
| | | |||||
* | | Merge pull request #1390 from vishpat/nuage_parameter_changes | Brenton Leanhardt | 2016-02-12 | 7 | -23/+23 |
|\ \ | | | | | | | Changes for new Nuage RPMS | ||||
| * | | Changes for new Nuage RPMS | Vishal Patil | 2016-02-11 | 7 | -23/+23 |
| | | | |||||
* | | | Merge pull request #1362 from detiber/fixLoopback | Brenton Leanhardt | 2016-02-12 | 3 | -34/+38 |
|\ \ \ | |_|/ |/| | | Fix loopback cluster name, context name, and user | ||||
| * | | conditionalize loopback config on v >= 3.2/1.2 | Jason DeTiberus | 2016-02-11 | 3 | -32/+35 |
| | | | |||||
| * | | Fix loopback cluster name, context name, and user | Jason DeTiberus | 2016-02-11 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #1324 from abutcher/fluentd-fixes | Brenton Leanhardt | 2016-02-11 | 12 | -210/+0 |
|\ \ \ | | | | | | | | | Remove fluentd_master and fluentd_node roles | ||||
| * | | | Remove fluentd_master and fluentd_node roles. | Andrew Butcher | 2016-02-08 | 12 | -202/+0 |
| | | | | |||||
| * | | | Remove etcd up checks from fluentd_master. | Andrew Butcher | 2016-02-04 | 1 | -8/+0 |
| | | | | |||||
* | | | | Merge pull request #1386 from detiber/pv_fixes | Brenton Leanhardt | 2016-02-11 | 2 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | Fixes pv/pvc creation for latest builds | ||||
| * | | | | Fixes pv/pvc creation for latest builds | Jason DeTiberus | 2016-02-11 | 2 | -2/+4 |
|/ / / / | |||||
* | | | | Merge pull request #1377 from brenton/bz1302970 | Brenton Leanhardt | 2016-02-11 | 4 | -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 Leanhardt | 2016-02-11 | 4 | -22/+71 |
|/ / / | | | | | | | | | | default | ||||
* | | | Automatic commit of package [openshift-ansible] release [3.0.40-1]. | Brenton Leanhardt | 2016-02-11 | 2 | -2/+36 |
| | | | |||||
* | | | Merge pull request #1383 from brenton/bz1306665 | Brenton Leanhardt | 2016-02-11 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Bug 1306665 - [metrics] update metrics-deployer template to use lates… | ||||
| * | | Bug 1306665 - [metrics] update metrics-deployer template to use latest image ↵ | Brenton Leanhardt | 2016-02-11 | 1 | -1/+1 |
|/ / | | | | | | | versions | ||||
* | | Merge pull request #1367 from detiber/githubOrg | Brenton Leanhardt | 2016-02-11 | 1 | -7/+20 |
|\ \ | | | | | | | Add organizations attribute to github identity provider | ||||
| * | | Add organizations attribute to github identity provider | Jason DeTiberus | 2016-02-10 | 1 | -7/+20 |
| | | | | | | | | | | | | - also fix location of mappingMethod in identityProviders config | ||||
* | | | Merge pull request #1380 from joelddiaz/zbx-action-user-diff | Joel Diaz | 2016-02-10 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | use correct dict key | ||||
| * | | | use correct dict key | Joel Diaz | 2016-02-10 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #1379 from joelddiaz/zbx-action-diff | Joel Diaz | 2016-02-10 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | handle being passed an empty group list | ||||
| * | | | handle being passed an empty group list | Joel Diaz | 2016-02-10 | 1 | -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/kubeproxy | Brenton Leanhardt | 2016-02-10 | 2 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Enable selection of kubeproxy mode | ||||
| * | | | | Enable selection of kubeproxy mode | Vishal Patil | 2016-02-10 | 2 | -0/+4 |
| | |/ / | |/| | | | | | | | | | | Addressed review comments | ||||
* | | | | Merge pull request #1370 from vanveele/iscsi-plugin | Brenton Leanhardt | 2016-02-10 | 5 | -4/+12 |
|\ \ \ \ | | | | | | | | | | | add iscsi storage_plugin dependency | ||||
| * | | | | add default storage plugins to 'origin' deployment_type | Robert van Veelen | 2016-02-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | update defaults and examples w/ iscsi plugin | Robert van Veelen | 2016-02-10 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | add iscsi storage_plugin dependency | Robert van Veelen | 2016-02-10 | 2 | -0/+8 |
| | | | | | |||||
* | | | | | Merge pull request #1326 from detiber/bz1303939 | Brenton Leanhardt | 2016-02-10 | 10 | -75/+87 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix infra_node deployment | ||||
| * | | | | fix default value | Jason DeTiberus | 2016-02-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add missing connection:local | Jason DeTiberus | 2016-02-09 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | consolidate oo_first_master post-config a bit, fix some roles that use ↵ | Jason DeTiberus | 2016-02-09 | 6 | -45/+31 |
| | | | | | | | | | | | | | | | | | | | | openshift_facts without declaring a dependency | ||||
| * | | | | openshift_serviceaccounts updates | Jason DeTiberus | 2016-02-09 | 4 | -41/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - make service account creation more flexible - create service accounts near where they are consumed | ||||
| * | | | | Fix infra_node deployment | Jason DeTiberus | 2016-02-09 | 1 | -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-calc | Joel Diaz | 2016-02-10 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | trigger on two successive bad pid counts | ||||
| * | | | | | trigger on two successive bad pid counts | Joel Diaz | 2016-02-10 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #1375 from stenwt/sturpin-2016-02-10-notnotsched | Sten Turpin | 2016-02-10 | 1 | -7/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | removed notscheduleable trigger, it just makes noise in its current i… | ||||
| * | | | | | | removed notscheduleable trigger, it just makes noise in its current incarnation | Sten Turpin | 2016-02-10 | 1 | -7/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1373 from stenwt/sturpin-2016-02-09-registry-health-fixed | Sten Turpin | 2016-02-10 | 1 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | added nodes not ready and nodes not schedulable triggers | ||||
| * | | | | | | added nodes not ready and nodes not schedulable triggers | Sten Turpin | 2016-02-10 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1359 from rharrison10/rharriso/dyn | Russell Harrison | 2016-02-10 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix a bug with existing CNAME records | ||||
| * | | | | | | Fix a bug with existing CNAME records | Russell Harrison | 2016-02-09 | 2 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1371 from abutcher/mask-atomic | Brenton Leanhardt | 2016-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't mask master service on atomic. | ||||
| * | | | | | | | Don't mask master service on atomic. | Andrew Butcher | 2016-02-10 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1372 from stenwt/sturpin-2016-02-09-registry-health | Sten Turpin | 2016-02-10 | 1 | -0/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | added nodes not ready and nodes not schedulable triggers | ||||
| * | | | | | | added nodes not ready and nodes not schedulable triggers | Sten Turpin | 2016-02-10 | 1 | -0/+26 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1368 from detiber/gte3_2 | Brenton Leanhardt | 2016-02-10 | 11 | -28/+32 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add gte check for 3.2, update version checks to gte | ||||
| * | | | | | Add gte check for 3.2, update version checks to gte | Jason DeTiberus | 2016-02-09 | 11 | -28/+32 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1364 from codificat/openshift-enterprise | Brenton Leanhardt | 2016-02-10 | 6 | -6/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Add missing atomic- and openshift-enterprise |