summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #432 from kwoodson/exampleKenny Woodson2015-08-061-0/+8
|\ | | | | Added example
| * 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 gene…
| * 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 load
| * Reduce heartbeat frequency to 500ms to reduce etcd cpu loadScott Dodson2015-08-051-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-inventoryWesley Hearn2015-08-055-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 genericAdam Miller2015-08-055-18/+18
| |
* | Merge pull request #413 from kwoodson/createpvKenny Woodson2015-08-052-0/+150
|\ \ | | | | | | Adding a playbook to create pv ebs
| * | 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 AWS
| * 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.
| * 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:subdomain
| * 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-registry
| * | 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 types
| * | Use AWS m4 instances typesPatrick Tescher2015-07-276-18/+18
| | | | | | | | | | | | AWS m4 replaces m3 and is a bit cheaper.
* | | 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 a test cluster instance.
| * | added roles symlink for zabbix_setup, fixed URL to work with ZAIO instead of ↵Thomas Wiest2015-07-293-2/+7
|/ / | | | | | | a test cluster instance.
* | Merge pull request #398 from brenton/bz1247461Brenton Leanhardt2015-07-2826-26/+26
|\ \ | | | | | | Bug 1247461 - Fixing github triggers for the xpaas templates
| * \ 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
| * | 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
|\ \ | | | | | | Monitoring container ansible playbook
| * | Ansible deploy for our monitoring containersKenny Woodson2015-07-273-0/+133
|/ /
* | Merge pull request #389 from detiber/nodeStartPauseBrenton Leanhardt2015-07-271-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 templatesBrenton Leanhardt2015-07-2826-26/+26
| |/
| * Add a pause after node startup to prevent restart handler from interfering ↵Jason DeTiberus2015-07-241-0/+5
|/ | | | with sdn configuration
* Merge pull request #390 from sdodson/updated-examplesBrenton Leanhardt2015-07-2442-331/+362
|\ | | | | Updated examples content
| * Updated examplesScott Dodson2015-07-2442-331/+362
| |
* | Merge pull request #388 from kwoodson/v3_deploy_helpKenny Woodson2015-07-241-3/+3
|\ \ | | | | | | Removed debug.
| * | Removed debug statementsKenny Woodson2015-07-241-3/+3
| | |
* | | Merge pull request #387 from kwoodson/v3_deploy_helpKenny Woodson2015-07-2414-10/+687
|\| | | | | | | | Initial zabbix setup.
| * | Adding initial zabbix setupKenny Woodson2015-07-2414-10/+687
| |/
* | Merge pull request #385 from detiber/ha_masterBrenton Leanhardt2015-07-241-0/+16
|\ \ | |/ |/| Copy more master certs for HA master
| * Copy more master certs for HA masterJason DeTiberus2015-07-231-0/+16
| |
* | Merge pull request #376 from wshearn/infra_node_supportWesley Hearn2015-07-2315-22/+145
|\ \ | | | | | | Infra node support
| * | Infra node supportWesley Hearn2015-07-2315-22/+145
| | |
* | | Merge pull request #382 from detiber/ha_masterWesley Hearn2015-07-221-1/+1
|\ \ \ | | |/ | |/| Fix generation of node certificates
| * | Fix generation of node certificatesJason DeTiberus2015-07-221-1/+1
|/ /
* | Merge pull request #380 from twiest/doc_changesThomas Wiest2015-07-222-6/+39
|\ \ | | | | | | added decisions made at the last ansible arch meeting.
| * | added decisions made at the last ansible arch meeting.Thomas Wiest2015-07-222-6/+39
|/ /
* | Merge pull request #378 from sdodson/issue333Brenton Leanhardt2015-07-211-0/+1
|\ \ | |/ |/| Add masterCA to ServiceAccountConfig
| * Add masterCA to ServiceAccountConfigScott Dodson2015-07-211-0/+1
|/
* Merge pull request #374 from detiber/ha_masterBrenton Leanhardt2015-07-202-5/+5
|\ | | | | properly test openshift_master_ha var
| * properly test openshift_master_ha varJason DeTiberus2015-07-202-5/+5
| |
* | Merge pull request #362 from sdodson/issue361Brenton Leanhardt2015-07-201-0/+1
|\ \ | | | | | | Issue361 - MatchNodeSelector should be first