summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #755 from brenton/uninstallBrenton Leanhardt2015-10-281-2/+3
|\ | | | | Bug fixes for the uninstall playbook
| * Bug fixes for the uninstall playbookBrenton Leanhardt2015-10-281-2/+3
| | | | | | | | | | | | 1) is_atomic wasn't being evaluated properly 2) the way we were detecting it was resulting in a confusion error message being displayed to the user in the case of RHEL 7 Server
* | Merge pull request #754 from joelddiaz/docker-ping-timeJoel Diaz2015-10-281-0/+5
|\ \ | |/ |/| Start tracking docker info execution time
| * Start tracking docker info execution timeJoel Diaz2015-10-281-0/+5
| |
* | Merge pull request #749 from brenton/uninstallBrenton Leanhardt2015-10-281-1/+11
|\ \ | | | | | | Adding uninstall support for Atomic Host
| * | The uninstall playbook should remove the kubeconfig for non-root installsBrenton Leanhardt2015-10-281-0/+1
| | |
| * | Adding uninstall support for Atomic HostBrenton Leanhardt2015-10-281-1/+10
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.3-1].Troy Dawson2015-10-272-2/+23
| |
* | Merge pull request #750 from twiest/prThomas Wiest2015-10-271-3/+14
|\ \ | | | | | | added docker info to the end of docker loop to direct lvm playbook.
| * | added docker info to the end of docker loop to direct lvm playbook.Thomas Wiest2015-10-241-3/+14
| | |
* | | Merge pull request #741 from tdawson/2015-10-utilsBrenton Leanhardt2015-10-2722-0/+2025
|\ \ \ | | | | | | | | Add atomic-openshift-utils
| * \ \ Merge pull request #1 from dgoodwin/pep8Troy Dawson2015-10-279-48/+81
| |\ \ \ | | | | | | | | | | Pylint fixes and ignores for incoming oo-install code.
| | * | | Pylint fixes and ignores for incoming oo-install code.Devan Goodwin2015-10-279-48/+81
| |/ / /
| * | | Add atomic-openshift-utilsTroy Dawson2015-10-2622-0/+1992
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add atomic-openshift-utils to openshift-ansible.spec file no need for redundent spec file remove dependencies that are not needed
* | | | Merge pull request #726 from sdodson/examples-syncBrenton Leanhardt2015-10-278-12/+85
|\ \ \ \ | | | | | | | | | | Update imagestreams and quickstarts from origin
| * | | | Update imagestreams and quickstarts from originScott Dodson2015-10-228-12/+85
| | | | |
* | | | | Merge pull request #731 from abutcher/proxy-client-configBrenton Leanhardt2015-10-276-8/+33
|\ \ \ \ \ | | | | | | | | | | | | Add proxy client certs to master config
| * | | | | Use standard library for version comparison.Andrew Butcher2015-10-261-4/+7
| | | | | |
| * | | | | Move version greater_than_fact into openshift_factsAndrew Butcher2015-10-223-8/+11
| | | | | |
| * | | | | Don't include proxy client cert when <3.1 or <1.1Andrew Butcher2015-10-222-5/+10
| | | | | |
| * | | | | Add proxy client certs to master config.Andrew Butcher2015-10-224-2/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #745 from abutcher/pylintThomas Wiest2015-10-261-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Pylint fixes
| * | | | | Pylint fixesAndrew Butcher2015-10-261-4/+4
|/ / / / /
* | | | | Merge pull request #744 from kwoodson/zbxztypeKenny Woodson2015-10-264-35/+68
|\ \ \ \ \ | | | | | | | | | | | | Adding zabbix_type to zbx_items and fixing zabbix agent items
| * | | | | Adding zabbix type and fixing zabbix agent varsKenny Woodson2015-10-264-35/+68
| | | | | |
* | | | | | Merge pull request #458 from spinolacastro/project_configBrenton Leanhardt2015-10-264-7/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Custom Project Config
| * | | | | | Fix quotesDiego Castro2015-10-261-1/+1
| | | | | | |
| * | | | | | Add missing quotesDiego Castro2015-10-231-6/+6
| | | | | | |
| * | | | | | fix merge conflictsDiego Castro2015-10-22204-1240/+6318
| |\ \ \ \ \ \
| * | | | | | | Get default values from openshift_factsDiego Castro2015-08-172-6/+34
| | | | | | | |
| * | | | | | | CleanupDiego Castro2015-08-172-2/+0
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'openshift/master' into project_configDiego Castro2015-08-1526-31/+389
| |\ \ \ \ \ \ \
| * | | | | | | | Add missing inventory exampleDiego Castro2015-08-121-1/+6
| | | | | | | | |
| * | | | | | | | Update PR #458 from commentsDiego Castro2015-08-123-30/+14
| | | | | | | | |
| * | | | | | | | Custom Project ConfigDiego Castro2015-08-125-9/+35
| | | | | | | | |
* | | | | | | | | Merge pull request #734 from ejemba/masterBrenton Leanhardt2015-10-261-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Adding Docker Log Options capabilities
| * | | | | | | | Adding Docker Log Options capabilitiesejemba2015-10-231-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-rpmspecThomas Wiest2015-10-264-0/+206
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Add rpm spec file for openshift-ansible
| * | | | | | | Add openshift-ansible.spec and setup titoTroy Dawson2015-10-264-0/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subpackages to openshift-ansible spec file put in correct directories
* | | | | | | | Merge pull request #729 from detiber/handlerRefactorBrenton Leanhardt2015-10-264-7/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid hardcoded 30s pauses
| * | | | | | | | cleanup naming for skipping master and node restart handlersJason DeTiberus2015-10-234-4/+4
| | | | | | | | |
| * | | | | | | | Avoid hardcoded 30s pausesJason DeTiberus2015-10-224-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor node and master restart handlers to avoid 30s pauses
* | | | | | | | | Merge pull request #740 from danmcp/masterThomas Wiest2015-10-252-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Openshift -> OpenShift
| * | | | | | | | Openshift -> OpenShiftDan McPherson2015-10-242-4/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #730 from detiber/rpmGenBrenton Leanhardt2015-10-222-14/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix test and workaround for rpm generated configs
| * | | | | | | | Fix test and workaround for rpm generated configsJason DeTiberus2015-10-222-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/fixFactsBrenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Fix error in openshift_facts
| * | | | | | | Fix error in openshift_factsJason DeTiberus2015-10-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | - fix error scraping openshift version for version numbers
* | | | | | | Merge pull request #736 from joelddiaz/cpu_no_pageJoel Diaz2015-10-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Lower priority to stop the paging action.
| * | | | | | | Lower priority to stop the paging action.Joel Diaz2015-10-221-1/+1
| | |_|_|_|_|/ | |/| | | | |