summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Issue361 - MatchNodeSelector should be firstScott Dodson2015-07-171-0/+1
| | |
* | | Merge pull request #365 from detiber/ha_masterThomas Wiest2015-07-194-3/+4
|\ \ \ | | |/ | |/| Update dependencies to ensure repos are available before openshift_master_* and etcd_* roles are run
| * | Update dependencies to ensure repos are available before openshift_master_* ↵Jason DeTiberus2015-07-174-3/+4
| | | | | | | | | | | | and etcd_* roles are run
* | | Merge pull request #363 from detiber/ha_masterThomas Wiest2015-07-171-1/+2
|\| | | | | | | | Add an initial delay for clustered HA startup verification
| * | Add an initial delay for clustered HA startup verificationJason DeTiberus2015-07-171-1/+2
| | |
* | | Merge pull request #264 from lhuard1A/rhel_subscriptionThomas Wiest2015-07-1710-6/+115
|\ \ \ | | | | | | | | Implement RHEL subscription for enterprise deployment type
| * | | Implement RHEL subscription for enterprise deployment typeLénaïc Huard2015-07-1710-6/+115
| | |/ | |/|
* | | Merge pull request #354 from nekop/remove-betaThomas Wiest2015-07-176-6/+6
|\ \ \ | | | | | | | | Replace outdated beta repo ids with 3.0 release
| * | | Replace outdated beta repo ids with 3.0 releaseTakayoshi Kimura2015-07-176-6/+6
| |/ /
* | | Merge pull request #355 from jjungnickel/patch-1Thomas Wiest2015-07-171-1/+1
|\ \ \ | | | | | | | | Update README_vagrant.md
| * | | Update README_vagrant.mdJan Jungnickel2015-07-171-1/+1
| |/ /
* | | Merge pull request #356 from jjungnickel/patch-2Thomas Wiest2015-07-171-0/+1
|\ \ \ | | | | | | | | Also exclude Ansible 1.9.0.1
| * | | Update main.ymlJan Jungnickel2015-07-171-0/+1
| |/ / | | | | | | 1.9.0.1 failed with IndentationError
* | | Merge pull request #348 from detiber/ha_masterThomas Wiest2015-07-1715-22/+234
|\ \ \ | | |/ | |/| Ha master
| * | fix typoJason DeTiberus2015-07-171-1/+1
| | |
| * | Add explicit timeouts to ha master resourceJason DeTiberus2015-07-171-1/+1
| | |