Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Copy more master certs for HA master | Jason DeTiberus | 2015-07-23 | 1 | -0/+16 |
| | | |||||
* | | Merge pull request #376 from wshearn/infra_node_support | Wesley Hearn | 2015-07-23 | 15 | -22/+145 |
|\ \ | | | | | | | Infra node support | ||||
| * | | Infra node support | Wesley Hearn | 2015-07-23 | 15 | -22/+145 |
| | | | |||||
* | | | Merge pull request #382 from detiber/ha_master | Wesley Hearn | 2015-07-22 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | Fix generation of node certificates | ||||
| * | | Fix generation of node certificates | Jason DeTiberus | 2015-07-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #380 from twiest/doc_changes | Thomas Wiest | 2015-07-22 | 2 | -6/+39 |
|\ \ | | | | | | | added decisions made at the last ansible arch meeting. | ||||
| * | | added decisions made at the last ansible arch meeting. | Thomas Wiest | 2015-07-22 | 2 | -6/+39 |
|/ / | |||||
* | | Merge pull request #378 from sdodson/issue333 | Brenton Leanhardt | 2015-07-21 | 1 | -0/+1 |
|\ \ | |/ |/| | Add masterCA to ServiceAccountConfig | ||||
| * | Add masterCA to ServiceAccountConfig | Scott Dodson | 2015-07-21 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #374 from detiber/ha_master | Brenton Leanhardt | 2015-07-20 | 2 | -5/+5 |
|\ | | | | | properly test openshift_master_ha var | ||||
| * | properly test openshift_master_ha var | Jason DeTiberus | 2015-07-20 | 2 | -5/+5 |
| | | |||||
* | | Merge pull request #362 from sdodson/issue361 | Brenton Leanhardt | 2015-07-20 | 1 | -0/+1 |
|\ \ | | | | | | | Issue361 - MatchNodeSelector should be first | ||||
| * | | Issue361 - MatchNodeSelector should be first | Scott Dodson | 2015-07-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #365 from detiber/ha_master | Thomas Wiest | 2015-07-19 | 4 | -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 DeTiberus | 2015-07-17 | 4 | -3/+4 |
| | | | | | | | | | | | | and etcd_* roles are run | ||||
* | | | Merge pull request #363 from detiber/ha_master | Thomas Wiest | 2015-07-17 | 1 | -1/+2 |
|\| | | | | | | | | Add an initial delay for clustered HA startup verification | ||||
| * | | Add an initial delay for clustered HA startup verification | Jason DeTiberus | 2015-07-17 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #264 from lhuard1A/rhel_subscription | Thomas Wiest | 2015-07-17 | 10 | -6/+115 |
|\ \ \ | | | | | | | | | Implement RHEL subscription for enterprise deployment type | ||||
| * | | | Implement RHEL subscription for enterprise deployment type | Lénaïc Huard | 2015-07-17 | 10 | -6/+115 |
| | |/ | |/| | |||||
* | | | Merge pull request #354 from nekop/remove-beta | Thomas Wiest | 2015-07-17 | 6 | -6/+6 |
|\ \ \ | | | | | | | | | Replace outdated beta repo ids with 3.0 release | ||||
| * | | | Replace outdated beta repo ids with 3.0 release | Takayoshi Kimura | 2015-07-17 | 6 | -6/+6 |
| |/ / | |||||
* | | | Merge pull request #355 from jjungnickel/patch-1 | Thomas Wiest | 2015-07-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update README_vagrant.md | ||||
| * | | | Update README_vagrant.md | Jan Jungnickel | 2015-07-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #356 from jjungnickel/patch-2 | Thomas Wiest | 2015-07-17 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Also exclude Ansible 1.9.0.1 | ||||
| * | | | Update main.yml | Jan Jungnickel | 2015-07-17 | 1 | -0/+1 |
| |/ / | | | | | | | 1.9.0.1 failed with IndentationError | ||||
* | | | Merge pull request #348 from detiber/ha_master | Thomas Wiest | 2015-07-17 | 15 | -22/+234 |
|\ \ \ | | |/ | |/| | Ha master |