Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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" | ||||
* | | | | | | 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 #730 from detiber/rpmGen | Brenton Leanhardt | 2015-10-22 | 1 | -14/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix test and workaround for rpm generated configs | ||||
| * | | | | | | Fix test and workaround for rpm generated configs | Jason DeTiberus | 2015-10-22 | 1 | -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/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 #721 from abutcher/fix-router | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Conditionally include openshift_router role | ||||
| * | | | | | Conditionally include openshift_router role. | Andrew Butcher | 2015-10-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | 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 | 2 | -5/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | 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 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | 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 #571 from dak1n1/router | Wesley Hearn | 2015-10-21 | 4 | -9/+45 |
|\ \ \ \ | | | | | | | | | | | Support HA or single router. Deploy after service accounts are created | ||||
| * | | | | Support HA or single router, and start work on registry | Stefanie Forrester | 2015-10-21 | 4 | -9/+45 |
| | | | | | |||||
* | | | | | Merge pull request #715 from kwoodson/zabb | Kenny Woodson | 2015-10-21 | 3 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding delta to zbx_item | ||||
| * | | | | | Adding delta feature to zbx_item | Kenny Woodson | 2015-10-20 | 3 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #704 from sdodson/sdn-iptables | Brenton Leanhardt | 2015-10-21 | 1 | -0/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add UDP 4789 firewall rule when using the SDN | ||||
| * | | | | | Open 4789/udp when using the SDN | Scott Dodson | 2015-10-19 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #714 from kwoodson/zabb | Kenny Woodson | 2015-10-20 | 4 | -32/+38 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Adding zabbix agent bits zabbix-server | ||||
| * | | | | | Zabbix server stat fixes. enable the proper item types. | Kenny Woodson | 2015-10-20 | 4 | -32/+38 |
| | | | | | | |||||
* | | | | | | Fix yaml indentation from use_openshift_sdn conditional | Andrew Butcher | 2015-10-20 | 1 | -2/+2 |
| | | | | | |