Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #745 from abutcher/pylint | Thomas Wiest | 2015-10-26 | 1 | -4/+4 |
|\ | | | | | Pylint fixes | ||||
| * | Pylint fixes | Andrew Butcher | 2015-10-26 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #744 from kwoodson/zbxztype | Kenny Woodson | 2015-10-26 | 4 | -35/+68 |
|\ | | | | | Adding zabbix_type to zbx_items and fixing zabbix agent items | ||||
| * | Adding zabbix type and fixing zabbix agent vars | Kenny Woodson | 2015-10-26 | 4 | -35/+68 |
| | | |||||
* | | Merge pull request #458 from spinolacastro/project_config | Brenton Leanhardt | 2015-10-26 | 4 | -7/+46 |
|\ \ | | | | | | | Custom Project Config | ||||
| * | | Fix quotes | Diego Castro | 2015-10-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add missing quotes | Diego Castro | 2015-10-23 | 1 | -6/+6 |
| | | | |||||
| * | | fix merge conflicts | Diego Castro | 2015-10-22 | 204 | -1240/+6318 |
| |\ \ | |||||
| * | | | Get default values from openshift_facts | Diego Castro | 2015-08-17 | 2 | -6/+34 |
| | | | | |||||
| * | | | Cleanup | Diego Castro | 2015-08-17 | 2 | -2/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'openshift/master' into project_config | Diego Castro | 2015-08-15 | 26 | -31/+389 |
| |\ \ \ | |||||
| * | | | | Add missing inventory example | Diego Castro | 2015-08-12 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Update PR #458 from comments | Diego Castro | 2015-08-12 | 3 | -30/+14 |
| | | | | | |||||
| * | | | | Custom Project Config | Diego Castro | 2015-08-12 | 5 | -9/+35 |
| | | | | | |||||
* | | | | | Merge pull request #734 from ejemba/master | Brenton Leanhardt | 2015-10-26 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding Docker Log Options capabilities | ||||
| * | | | | | Adding Docker Log Options capabilities | ejemba | 2015-10-23 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In regard of issue https://github.com/openshift/openshift-ansible/issues/696 added options (docker_log_dirver and docker_log_options) to bin/cluster: bin/cluster -o docker_log_driver=json-file -o docker_log_options="max-size=5m,max-files=5" will be added to OPTION in /etc/sysconfig/docker in all nodes of the cluster: "--log-driver json-file --log-opt max-size=5m --log-opt max-files=5" | ||||
* | | | | | | Merge pull request #703 from tdawson/2015-10-rpmspec | Thomas Wiest | 2015-10-26 | 4 | -0/+206 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add rpm spec file for openshift-ansible | ||||
| * | | | | | Add openshift-ansible.spec and setup tito | Troy Dawson | 2015-10-26 | 4 | -0/+206 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subpackages to openshift-ansible spec file put in correct directories | ||||
* | | | | | | Merge pull request #729 from detiber/handlerRefactor | Brenton Leanhardt | 2015-10-26 | 4 | -7/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Avoid hardcoded 30s pauses | ||||
| * | | | | | | cleanup naming for skipping master and node restart handlers | Jason DeTiberus | 2015-10-23 | 4 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Avoid hardcoded 30s pauses | Jason DeTiberus | 2015-10-22 | 4 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor node and master restart handlers to avoid 30s pauses | ||||
* | | | | | | | Merge pull request #740 from danmcp/master | Thomas Wiest | 2015-10-25 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Openshift -> OpenShift | ||||
| * | | | | | | Openshift -> OpenShift | Dan McPherson | 2015-10-24 | 2 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #730 from detiber/rpmGen | Brenton Leanhardt | 2015-10-22 | 2 | -14/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix test and workaround for rpm generated configs | ||||
| * | | | | | | Fix test and workaround for rpm generated configs | Jason DeTiberus | 2015-10-22 | 2 | -14/+15 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed inconcistency in naming for rpm generated config test - refactoring to fix logic after the ha master refactoring had broken the previous steps | ||||
* | | | | | | Merge pull request #727 from detiber/fixFacts | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix error in openshift_facts | ||||
| * | | | | | Fix error in openshift_facts | Jason DeTiberus | 2015-10-22 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | - fix error scraping openshift version for version numbers | ||||
* | | | | | Merge pull request #736 from joelddiaz/cpu_no_page | Joel Diaz | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Lower priority to stop the paging action. | ||||
| * | | | | | Lower priority to stop the paging action. | Joel Diaz | 2015-10-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #728 from sdodson/fix-examples | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix openshift_examples | ||||
| * | | | | | Fix openshift_examples | Scott Dodson | 2015-10-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #691 from jaryn/patch-1 | Brenton Leanhardt | 2015-10-22 | 1 | -8/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add dependencies missing on RHEL 7.1 to README | ||||
| * | | | | | | Add dependencies missing on RHEL 7.1 | Jaroslav Henner | 2015-10-13 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | Add deps missing when using RHEL 7.1 to run openshift-ansible with libvirt | ||||
* | | | | | | | Merge pull request #713 from brenton/uninstall | Brenton Leanhardt | 2015-10-22 | 2 | -74/+137 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Improvements to uninstallation playbook | ||||
| * | | | | | | Deleting exited openshift containers and some other minor touch ups | Brenton Leanhardt | 2015-10-22 | 1 | -1/+17 |
| | | | | | | | |||||
| * | | | | | | Removing the openshift facts | Brenton Leanhardt | 2015-10-22 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Adding *master-api and *master-controllers to the list of units to stop | Brenton Leanhardt | 2015-10-22 | 1 | -19/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (also sorted the various lists alphabetically) | ||||
| * | | | | | | Improvements to uninstallation playbook | Brenton Leanhardt | 2015-10-22 | 2 | -74/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is related to https://trello.com/c/314nwSvt/58-3-uninstall-playbook The original atomic_openshift_tutorial_reset.yml now calls the uninstall playbook for most parts. All the originally functionally is still intact. The main differences between the two playbooks is that the uninstall playbook is careful only to delete content that ansible originally installed. | ||||
* | | | | | | | Merge pull request #721 from abutcher/fix-router | Brenton Leanhardt | 2015-10-22 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Conditionally include openshift_router role | ||||
| * | | | | | | | Conditionally include openshift_router role. | Andrew Butcher | 2015-10-22 | 2 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #723 from mfojtik/patch-1 | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Update examples-sync.sh | ||||
| * | | | | | | | Update examples-sync.sh | Michal Fojtik | 2015-10-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update examples-sync.sh | Michal Fojtik | 2015-10-22 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | Fixes: https://github.com/openshift/openshift-ansible/issues/722 | ||||
* | | | | | | | Merge pull request #678 from sdodson/examples | Wesley Hearn | 2015-10-22 | 3 | -7/+6 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Adjust the logic as to when examples are deployed | ||||
| * | | | | | | Add match online imagestream/template loading to enterprise | Scott Dodson | 2015-10-20 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Adjust the logic as to when examples are deployed | Scott Dodson | 2015-10-20 | 3 | -7/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #720 from kikov79/master | Brenton Leanhardt | 2015-10-22 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove pylint comment from Sha-Bang. SSH process get hung when calling python | ||||
| * | | | | | | | Remove pylint comment from Sha-Bang. SSH process get hung when calling ↵ | Francisco Gimeno | 2015-10-21 | 1 | -1/+2 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | python # pylint: disable=too-many-lines | ||||
* | | | | | | | Merge pull request #719 from sdodson/fix-yaml-tabbing | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix yaml tabbing | ||||
| * | | | | | | Fix yaml tabbing | Scott Dodson | 2015-10-21 | 1 | -1/+1 |
|/ / / / / / |