Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #446 from kwoodson/idem | Kenny Woodson | 2015-08-11 | 17 | -676/+1406 |
|\ | | | | | Zabbix Idempotent module | ||||
| * | Zabbix Idempotency | Kenny Woodson | 2015-08-11 | 17 | -676/+1406 |
| | | |||||
* | | Merge pull request #445 from mwoodson/remove_monitor | Matt Woodson | 2015-08-11 | 3 | -133/+0 |
|\ \ | |/ |/| | removed deploy monitoring containders | ||||
| * | removed deploy monitoring containders | Matt Woodson | 2015-08-11 | 3 | -133/+0 |
|/ | |||||
* | Merge pull request #442 from lhuard1A/infra_node_support_libvirt | Wesley Hearn | 2015-08-11 | 1 | -1/+1 |
|\ | | | | | Fix infra node support on libvirt | ||||
| * | Fix infra node support on libvirt | Lénaïc Huard | 2015-08-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #439 from wshearn/online_use_offical_registry | Wesley Hearn | 2015-08-10 | 1 | -2/+1 |
|\ | | | | | Use the official redhat registry for online | ||||
| * | Use the official redhat registry for online | Wesley Hearn | 2015-08-10 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #435 from dak1n1/numnode_pause | Stefanie Forrester | 2015-08-07 | 1 | -2/+2 |
|\ | | | | | take number of nodes into account when pausing | ||||
| * | take number of nodes into account when pausing | Stefanie Forrester | 2015-08-07 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #431 from dak1n1/tdagent_pause | Stefanie Forrester | 2015-08-06 | 1 | -0/+3 |
|\ | | | | | added pause before td-agent restart | ||||
| * | added pause before td-agent restart | Stefanie Forrester | 2015-08-06 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #432 from kwoodson/example | Kenny Woodson | 2015-08-06 | 1 | -0/+8 |
|\ \ | |/ |/| | Added example | ||||
| * | example added | Kenny Woodson | 2015-08-06 | 1 | -0/+8 |
|/ | |||||
* | Merge pull request #430 from sdodson/revert-423-namespace-inventory | Brenton Leanhardt | 2015-08-06 | 5 | -18/+18 |
|\ | | | | | Revert "namespace the byo inventory so the group names aren't so gene… | ||||
| * | Revert "namespace the byo inventory so the group names aren't so generic" | Scott Dodson | 2015-08-06 | 5 | -18/+18 |
|/ | |||||
* | Merge pull request #427 from sdodson/500ms-heartbeat | Brenton Leanhardt | 2015-08-05 | 1 | -2/+2 |
|\ | | | | | Reduce heartbeat frequency to 500ms to reduce etcd cpu load | ||||
| * | Reduce heartbeat frequency to 500ms to reduce etcd cpu load | Scott Dodson | 2015-08-05 | 1 | -2/+2 |
|/ | | | | | | | Per https://github.com/coreos/etcd/pull/3097 reduce heartbeat to 500ms until we can ensure etcd 2.1 is in use Reduces the impact of but doesn't fix BZ1250310 | ||||
* | Merge pull request #423 from maxamillion/namespace-inventory | Wesley Hearn | 2015-08-05 | 5 | -18/+18 |
|\ | | | | | namespace the byo inventory so the group names aren't so generic | ||||
| * | namespace the byo inventory so the group names aren't so generic | Adam Miller | 2015-08-05 | 5 | -18/+18 |
| | | |||||
* | | Merge pull request #413 from kwoodson/createpv | Kenny Woodson | 2015-08-05 | 2 | -0/+150 |
|\ \ | | | | | | | Adding a playbook to create pv ebs | ||||
| * | | Added a pv creation script | Kenny Woodson | 2015-08-05 | 2 | -0/+150 |
| |/ | |||||
* | | Merge pull request #421 from wshearn/increase_disk | Wesley Hearn | 2015-08-05 | 1 | -1/+1 |
|\ \ | |/ |/| | Increase disk size for AWS | ||||
| * | Increase disk size for AWS | Wesley Hearn | 2015-08-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #409 from abutcher/ldap-identity-provider | Brenton Leanhardt | 2015-08-03 | 1 | -0/+14 |
|\ | | | | | Add LDAPPasswordIdentityProvider bits to identity_provider_config macro. | ||||
| * | Add LDAPPasswordIdentityProvider bits to identity_provider_config macro. | Andrew Butcher | 2015-07-31 | 1 | -0/+14 |
|/ | |||||
* | Merge pull request #400 from detiber/addSubdomainConfig | Thomas Wiest | 2015-07-31 | 3 | -1/+5 |
|\ | | | | | Add support for setting routingConfig:subdomain | ||||
| * | Add support for setting routingConfig:subdomain | Jason DeTiberus | 2015-07-28 | 3 | -1/+5 |
| | | |||||
* | | Merge pull request #404 from maxamillion/fix_registry_docs | Thomas Wiest | 2015-07-31 | 1 | -2/+5 |
|\ \ | | | | | | | add link to persistent storage config docs for docker-registry | ||||
| * | | add link to persistent storage config docs for docker-registry | Adam Miller | 2015-07-29 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #395 from pat2man/m4_aws_instances | Wesley Hearn | 2015-07-30 | 6 | -18/+18 |
|\ \ \ | |/ / |/| | | Use AWS m4 instances types | ||||
| * | | Use AWS m4 instances types | Patrick Tescher | 2015-07-27 | 6 | -18/+18 |
| | | | | | | | | | | | | AWS m4 replaces m3 and is a bit cheaper. | ||||
* | | | Merge pull request #402 from twiest/pr | Thomas Wiest | 2015-07-29 | 3 | -2/+7 |
|\ \ \ | |_|/ |/| | | added roles symlink for zabbix_setup, fixed URL to work with ZAIO instead of a test cluster instance. | ||||
| * | | added roles symlink for zabbix_setup, fixed URL to work with ZAIO instead of ↵ | Thomas Wiest | 2015-07-29 | 3 | -2/+7 |
|/ / | | | | | | | a test cluster instance. | ||||
* | | Merge pull request #398 from brenton/bz1247461 | Brenton Leanhardt | 2015-07-28 | 26 | -26/+26 |
|\ \ | | | | | | | Bug 1247461 - Fixing github triggers for the xpaas templates | ||||
| * \ | Merging in the latest fix from OSE | Brenton Leanhardt | 2015-07-28 | 5 | -0/+143 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #397 from wshearn/master_as_node | Wesley Hearn | 2015-07-27 | 2 | -0/+10 |
|\ \ \ | |_|/ |/| | | Setup openshift-node on the masters | ||||
| * | | Setup openshift-node on the masters so that the web console can access the pods | Wesley Hearn | 2015-07-27 | 2 | -0/+10 |
|/ / | |||||
* | | Merge pull request #392 from kwoodson/mon_containers | Kenny Woodson | 2015-07-27 | 3 | -0/+133 |
|\ \ | | | | | | | Monitoring container ansible playbook | ||||
| * | | Ansible deploy for our monitoring containers | Kenny Woodson | 2015-07-27 | 3 | -0/+133 |
|/ / | |||||
* | | Merge pull request #389 from detiber/nodeStartPause | Brenton Leanhardt | 2015-07-27 | 1 | -0/+5 |
|\ \ | | | | | | | Add a pause after node startup to prevent restart handler from interfering with sdn configuration | ||||
| | * | Bug 1247461 - Fixing github triggers for the xpaas templates | Brenton Leanhardt | 2015-07-28 | 26 | -26/+26 |
| |/ | |||||
| * | Add a pause after node startup to prevent restart handler from interfering ↵ | Jason DeTiberus | 2015-07-24 | 1 | -0/+5 |
|/ | | | | with sdn configuration | ||||
* | Merge pull request #390 from sdodson/updated-examples | Brenton Leanhardt | 2015-07-24 | 42 | -331/+362 |
|\ | | | | | Updated examples content | ||||
| * | Updated examples | Scott Dodson | 2015-07-24 | 42 | -331/+362 |
| | | |||||
* | | Merge pull request #388 from kwoodson/v3_deploy_help | Kenny Woodson | 2015-07-24 | 1 | -3/+3 |
|\ \ | | | | | | | Removed debug. | ||||
| * | | Removed debug statements | Kenny Woodson | 2015-07-24 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #387 from kwoodson/v3_deploy_help | Kenny Woodson | 2015-07-24 | 14 | -10/+687 |
|\| | | | | | | | | Initial zabbix setup. | ||||
| * | | Adding initial zabbix setup | Kenny Woodson | 2015-07-24 | 14 | -10/+687 |
| |/ | |||||
* | | Merge pull request #385 from detiber/ha_master | Brenton Leanhardt | 2015-07-24 | 1 | -0/+16 |
|\ \ | |/ |/| | Copy more master certs for HA master |