summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into upgradeDevan Goodwin2015-11-0228-100/+322
|\
| * Merge pull request #785 from joelddiaz/pcp-zabbix-statusJoel Diaz2015-11-022-0/+23
| |\ | | | | | | get zabbix ready to start tracking status of pcp
| | * get zabbix ready to start tracking status of pcpJoel Diaz2015-11-022-0/+23
| | |
| * | Merge pull request #772 from detiber/aepBrenton Leanhardt2015-11-023-2/+18
| |\ \ | | | | | | | | Disable OpenShift features if installing Atomic Enterprise
| | * | Disable OpenShift features if installing Atomic EnterpriseJason DeTiberus2015-10-303-2/+18
| | | |
| * | | Merge pull request #786 from mwoodson/cpu_alertMatt Woodson2015-11-021-3/+3
| |\ \ \ | | |_|/ | |/| | changed the cpu alert to only alert if cpu idle more than 5x.
| | * | changed the cpu alert to only alert if cpu idle more than 5x. Change alert ↵Matt Woodson2015-11-021-4/+4
| | | | | | | | | | | | | | | | to warning
| * | | Use more specific enterprise version for version_greater_than_3_1_or_1_1.Andrew Butcher2015-10-301-1/+1
| | |/ | |/|
| * | Merge pull request #766 from brenton/masterBrenton Leanhardt2015-10-291-0/+4
| |\ \ | | | | | | | | Conditionalizing the support for the v1beta3 api
| | * | Conditionalizing the support for the v1beta3 apiBrenton Leanhardt2015-10-291-0/+4
| | | | | | | | | | | | | | | | | | | | v1beta3 is only supported on OSE 3.0. For 3.0 the deployment_type was "enterprise"
| * | | Removing the template and doing to_nice_yaml insteadKenny Woodson2015-10-292-29/+4
| |/ /
| * | Merge pull request #738 from detiber/storage_pluginsBrenton Leanhardt2015-10-296-4/+49
| |\ \ | | | | | | | | Install storage plugin dependencies
| | * | make storage_plugin_deps conditional on deployment_typeJason DeTiberus2015-10-271-17/+9
| | | |
| | * | remove debugging pausesJason DeTiberus2015-10-261-4/+0
| | | |
| | * | make storage plugin dependency installation more flexibleJason DeTiberus2015-10-266-18/+60
| | | |
| | * | Install storage plugin dependenciesJason DeTiberus2015-10-261-2/+17
| | | |
| * | | Merge pull request #759 from kwoodson/minventoryKenny Woodson2015-10-281-3/+3
| |\ \ \ | | | | | | | | | | Fixed rename for extra_vars.
| | * | | Fixing for extra_vars rename.Kenny Woodson2015-10-281-3/+3
| | | | |
| * | | | 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 #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-274-6/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | 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-222-4/+10
| | | | | | |
| | * | | | | Don't include proxy client cert when <3.1 or <1.1Andrew Butcher2015-10-221-2/+3
| | | | | | |
| | * | | | | Add proxy client certs to master config.Andrew Butcher2015-10-222-2/+4
| | | | | | |
| * | | | | | 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-263-7/+39
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Custom Project Config
| | * | | | | | Fix quotesDiego Castro2015-10-261-1/+1
| | | | | | | |
| | * | | | | | Add missing quotesDiego Castro2015-10-231-6/+6
| | | | | | | |
| | * | | | | | fix merge conflictsDiego Castro2015-10-22120-619/+4713
| | |\ \ \ \ \ \
| | * | | | | | | Get default values from openshift_factsDiego Castro2015-08-172-6/+34
| | | | | | | | |
| | * | | | | | | CleanupDiego Castro2015-08-171-1/+0
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'openshift/master' into project_configDiego Castro2015-08-159-7/+42
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update PR #458 from commentsDiego Castro2015-08-123-30/+14
| | | | | | | | | |
| | * | | | | | | | Custom Project ConfigDiego Castro2015-08-124-9/+32
| | | | | | | | | |
| * | | | | | | | | 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"
* | / | | | | | | Add etcd_data_dir fact.Devan Goodwin2015-10-301-0/+6
|/ / / / / / / /
* | | | | | | | 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 #730 from detiber/rpmGenBrenton Leanhardt2015-10-221-14/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix test and workaround for rpm generated configs
| * | | | | | | Fix test and workaround for rpm generated configsJason DeTiberus2015-10-221-14/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.