summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #446 from kwoodson/idemKenny Woodson2015-08-1117-676/+1406
|\
| * Zabbix IdempotencyKenny Woodson2015-08-1117-676/+1406
* | Merge pull request #445 from mwoodson/remove_monitorMatt Woodson2015-08-113-133/+0
|\ \ | |/ |/|
| * removed deploy monitoring containdersMatt Woodson2015-08-113-133/+0
|/
* Merge pull request #442 from lhuard1A/infra_node_support_libvirtWesley Hearn2015-08-111-1/+1
|\
| * Fix infra node support on libvirtLénaïc Huard2015-08-111-1/+1
|/
* Merge pull request #439 from wshearn/online_use_offical_registryWesley Hearn2015-08-101-2/+1
|\
| * Use the official redhat registry for onlineWesley Hearn2015-08-101-2/+1
|/
* Merge pull request #435 from dak1n1/numnode_pauseStefanie Forrester2015-08-071-2/+2
|\
| * take number of nodes into account when pausingStefanie Forrester2015-08-071-2/+2
|/
* Merge pull request #431 from dak1n1/tdagent_pauseStefanie Forrester2015-08-061-0/+3
|\
| * added pause before td-agent restartStefanie Forrester2015-08-061-0/+3
* | Merge pull request #432 from kwoodson/exampleKenny Woodson2015-08-061-0/+8
|\ \ | |/ |/|
| * example addedKenny Woodson2015-08-061-0/+8
|/
* Merge pull request #430 from sdodson/revert-423-namespace-inventoryBrenton Leanhardt2015-08-065-18/+18
|\
| * Revert "namespace the byo inventory so the group names aren't so generic"Scott Dodson2015-08-065-18/+18
|/
* Merge pull request #427 from sdodson/500ms-heartbeatBrenton Leanhardt2015-08-051-2/+2
|\
| * Reduce heartbeat frequency to 500ms to reduce etcd cpu loadScott Dodson2015-08-051-2/+2
|/
* Merge pull request #423 from maxamillion/namespace-inventoryWesley Hearn2015-08-055-18/+18
|\
| * namespace the byo inventory so the group names aren't so genericAdam Miller2015-08-055-18/+18
* | Merge pull request #413 from kwoodson/createpvKenny Woodson2015-08-052-0/+150
|\ \
| * | Added a pv creation scriptKenny Woodson2015-08-052-0/+150
| |/
* | Merge pull request #421 from wshearn/increase_diskWesley Hearn2015-08-051-1/+1
|\ \ | |/ |/|
| * Increase disk size for AWSWesley Hearn2015-08-051-1/+1
|/
* Merge pull request #409 from abutcher/ldap-identity-providerBrenton Leanhardt2015-08-031-0/+14
|\
| * Add LDAPPasswordIdentityProvider bits to identity_provider_config macro.Andrew Butcher2015-07-311-0/+14
|/
* Merge pull request #400 from detiber/addSubdomainConfigThomas Wiest2015-07-313-1/+5
|\
| * Add support for setting routingConfig:subdomainJason DeTiberus2015-07-283-1/+5
* | Merge pull request #404 from maxamillion/fix_registry_docsThomas Wiest2015-07-311-2/+5
|\ \
| * | add link to persistent storage config docs for docker-registryAdam Miller2015-07-291-2/+5
* | | Merge pull request #395 from pat2man/m4_aws_instancesWesley Hearn2015-07-306-18/+18
|\ \ \ | |/ / |/| |
| * | Use AWS m4 instances typesPatrick Tescher2015-07-276-18/+18
* | | Merge pull request #402 from twiest/prThomas Wiest2015-07-293-2/+7
|\ \ \ | |_|/ |/| |
| * | added roles symlink for zabbix_setup, fixed URL to work with ZAIO instead of ...Thomas Wiest2015-07-293-2/+7
|/ /
* | Merge pull request #398 from brenton/bz1247461Brenton Leanhardt2015-07-2826-26/+26
|\ \
| * \ Merging in the latest fix from OSEBrenton Leanhardt2015-07-285-0/+143
| |\ \ | |/ / |/| |
* | | Merge pull request #397 from wshearn/master_as_nodeWesley Hearn2015-07-272-0/+10
|\ \ \ | |_|/ |/| |
| * | Setup openshift-node on the masters so that the web console can access the podsWesley Hearn2015-07-272-0/+10
|/ /
* | Merge pull request #392 from kwoodson/mon_containersKenny Woodson2015-07-273-0/+133
|\ \
| * | Ansible deploy for our monitoring containersKenny Woodson2015-07-273-0/+133
|/ /
* | Merge pull request #389 from detiber/nodeStartPauseBrenton Leanhardt2015-07-271-0/+5
|\ \
| | * Bug 1247461 - Fixing github triggers for the xpaas templatesBrenton Leanhardt2015-07-2826-26/+26
| |/
| * Add a pause after node startup to prevent restart handler from interfering wi...Jason DeTiberus2015-07-241-0/+5
|/
* Merge pull request #390 from sdodson/updated-examplesBrenton Leanhardt2015-07-2442-331/+362
|\
| * Updated examplesScott Dodson2015-07-2442-331/+362
* | Merge pull request #388 from kwoodson/v3_deploy_helpKenny Woodson2015-07-241-3/+3
|\ \
| * | Removed debug statementsKenny Woodson2015-07-241-3/+3
* | | Merge pull request #387 from kwoodson/v3_deploy_helpKenny Woodson2015-07-2414-10/+687
|\| |
| * | Adding initial zabbix setupKenny Woodson2015-07-2414-10/+687
| |/
* | Merge pull request #385 from detiber/ha_masterBrenton Leanhardt2015-07-241-0/+16
|\ \ | |/ |/|