Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into upgrade | Devan Goodwin | 2015-11-03 | 23 | -69/+254 |
|\ | |||||
| * | Moving to Openshift Etcd application | Marek Mahut | 2015-11-03 | 1 | -12/+12 |
| | | |||||
| * | Merge pull request #609 from sdodson/add-all-hostnames | Brenton Leanhardt | 2015-11-03 | 3 | -0/+15 |
| |\ | | | | | | | Add all the possible servicenames to openshift_all_hostnames | ||||
| | * | Add all the possible servicenames to openshift_all_hostnames for masters | Scott Dodson | 2015-11-03 | 3 | -0/+15 |
| | | | |||||
| * | | Merge pull request #782 from mmahut/etcd | Marek Mahut | 2015-11-03 | 1 | -0/+82 |
| |\ \ | | |/ | |/| | Adding openshift.node.etcd items | ||||
| | * | Adding openshift.node.etcd items | Marek Mahut | 2015-11-03 | 1 | -0/+82 |
| | | | |||||
| * | | Merge pull request #702 from detiber/etcd_cert_fix | Brenton Leanhardt | 2015-11-03 | 19 | -69/+157 |
| |\ \ | | |/ | |/| | Fix etcd cert generation when etcd_interface is defined | ||||
| | * | Fix etcd cert generation when etcd_interface is defined | Jason DeTiberus | 2015-11-02 | 19 | -69/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Refactor certificate generation to properly accept overrides of etcd_interface per host and set the certificate SANS and peer URLs properly. - Add sanity checking to user-set values of etcd_interface to provide a better error message | ||||
* | | | Merge remote-tracking branch 'upstream/master' into upgrade | Devan Goodwin | 2015-11-02 | 28 | -100/+322 |
|\| | | |||||
| * | | Merge pull request #785 from joelddiaz/pcp-zabbix-status | Joel Diaz | 2015-11-02 | 2 | -0/+23 |
| |\ \ | | | | | | | | | get zabbix ready to start tracking status of pcp | ||||
| | * | | get zabbix ready to start tracking status of pcp | Joel Diaz | 2015-11-02 | 2 | -0/+23 |
| | | | | |||||
| * | | | Merge pull request #772 from detiber/aep | Brenton Leanhardt | 2015-11-02 | 3 | -2/+18 |
| |\ \ \ | | | | | | | | | | | Disable OpenShift features if installing Atomic Enterprise | ||||
| | * | | | Disable OpenShift features if installing Atomic Enterprise | Jason DeTiberus | 2015-10-30 | 3 | -2/+18 |
| | | | | | |||||
| * | | | | Merge pull request #786 from mwoodson/cpu_alert | Matt Woodson | 2015-11-02 | 1 | -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 Woodson | 2015-11-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | to warning | ||||
| * | | | | Use more specific enterprise version for version_greater_than_3_1_or_1_1. | Andrew Butcher | 2015-10-30 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #766 from brenton/master | Brenton Leanhardt | 2015-10-29 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | | | Conditionalizing the support for the v1beta3 api | ||||
| | * | | | Conditionalizing the support for the v1beta3 api | Brenton Leanhardt | 2015-10-29 | 1 | -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 instead | Kenny Woodson | 2015-10-29 | 2 | -29/+4 |
| |/ / / | |||||
| * | | | Merge pull request #738 from detiber/storage_plugins | Brenton Leanhardt | 2015-10-29 | 6 | -4/+49 |
| |\ \ \ | | | | | | | | | | | Install storage plugin dependencies | ||||
| | * | | | make storage_plugin_deps conditional on deployment_type | Jason DeTiberus | 2015-10-27 | 1 | -17/+9 |
| | | | | | |||||
| | * | | | remove debugging pauses | Jason DeTiberus | 2015-10-26 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | make storage plugin dependency installation more flexible | Jason DeTiberus | 2015-10-26 | 6 | -18/+60 |
| | | | | | |||||
| | * | | | Install storage plugin dependencies | Jason DeTiberus | 2015-10-26 | 1 | -2/+17 |
| | | | | | |||||
| * | | | | Merge pull request #759 from kwoodson/minventory | Kenny Woodson | 2015-10-28 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Fixed rename for extra_vars. | ||||
| | * | | | | Fixing for extra_vars rename. | Kenny Woodson | 2015-10-28 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #754 from joelddiaz/docker-ping-time | Joel Diaz | 2015-10-28 | 1 | -0/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Start tracking docker info execution time | ||||
| | * | | | | | Start tracking docker info execution time | Joel Diaz | 2015-10-28 | 1 | -0/+5 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #726 from sdodson/examples-sync | Brenton Leanhardt | 2015-10-27 | 8 | -12/+85 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Update imagestreams and quickstarts from origin | ||||
| | * | | | | Update imagestreams and quickstarts from origin | Scott Dodson | 2015-10-22 | 8 | -12/+85 |
| | | | | | | |||||
| * | | | | | Merge pull request #731 from abutcher/proxy-client-config | Brenton Leanhardt | 2015-10-27 | 4 | -6/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add proxy client certs to master config | ||||
| | * | | | | | Use standard library for version comparison. | Andrew Butcher | 2015-10-26 | 1 | -4/+7 |
| | | | | | | | |||||
| | * | | | | | Move version greater_than_fact into openshift_facts | Andrew Butcher | 2015-10-22 | 2 | -4/+10 |
| | | | | | | | |||||
| | * | | | | | Don't include proxy client cert when <3.1 or <1.1 | Andrew Butcher | 2015-10-22 | 1 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | Add proxy client certs to master config. | Andrew Butcher | 2015-10-22 | 2 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | 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 | 3 | -7/+39 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | 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 | 120 | -619/+4713 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Get default values from openshift_facts | Diego Castro | 2015-08-17 | 2 | -6/+34 |
| | | | | | | | | | |||||
| | * | | | | | | | Cleanup | Diego Castro | 2015-08-17 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'openshift/master' into project_config | Diego Castro | 2015-08-15 | 9 | -7/+42 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update PR #458 from comments | Diego Castro | 2015-08-12 | 3 | -30/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Custom Project Config | Diego Castro | 2015-08-12 | 4 | -9/+32 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 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" | ||||
* | / | | | | | | | Add etcd_data_dir fact. | Devan Goodwin | 2015-10-30 | 1 | -0/+6 |
|/ / / / / / / / |