summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
* | | | | | Merge pull request #728 from sdodson/fix-examplesBrenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix openshift_examples
| * | | | | Fix openshift_examplesScott Dodson2015-10-221-1/+1
| | | | | |
* | | | | | Merge pull request #691 from jaryn/patch-1Brenton Leanhardt2015-10-221-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add dependencies missing on RHEL 7.1 to README
| * | | | | | Add dependencies missing on RHEL 7.1Jaroslav Henner2015-10-131-8/+10
| | | | | | | | | | | | | | | | | | | | | Add deps missing when using RHEL 7.1 to run openshift-ansible with libvirt
* | | | | | | Merge pull request #713 from brenton/uninstallBrenton Leanhardt2015-10-222-74/+137
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Improvements to uninstallation playbook
| * | | | | | Deleting exited openshift containers and some other minor touch upsBrenton Leanhardt2015-10-221-1/+17
| | | | | | |
| * | | | | | Removing the openshift factsBrenton Leanhardt2015-10-221-0/+1
| | | | | | |
| * | | | | | Adding *master-api and *master-controllers to the list of units to stopBrenton Leanhardt2015-10-221-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (also sorted the various lists alphabetically)
| * | | | | | Improvements to uninstallation playbookBrenton Leanhardt2015-10-222-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-routerBrenton Leanhardt2015-10-222-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Conditionally include openshift_router role
| * | | | | | | Conditionally include openshift_router role.Andrew Butcher2015-10-222-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #723 from mfojtik/patch-1Brenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Update examples-sync.sh
| * | | | | | | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| | | | | | | |
| * | | | | | | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | Fixes: https://github.com/openshift/openshift-ansible/issues/722
* | | | | | | Merge pull request #678 from sdodson/examplesWesley Hearn2015-10-223-7/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Adjust the logic as to when examples are deployed
| * | | | | | Add match online imagestream/template loading to enterpriseScott Dodson2015-10-201-3/+3
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:51:51 +0000