Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1258 from openshift/prod | Thomas Wiest | 2016-01-21 | 0 | -0/+0 |
|\ | | | | | Sync prod -> master branch. | ||||
| * | Merge pull request #1256 from openshift/master | Thomas Wiest | 2016-01-21 | 7 | -66/+74 |
| |\ | |/ |/| | sync master -> prod branch | ||||
* | | Merge pull request #1254 from twiest/pr | Thomas Wiest | 2016-01-21 | 2 | -0/+28 |
|\ \ | | | | | | | Added template for config loop. | ||||
| * | | Added template for config loop. | Thomas Wiest | 2016-01-21 | 2 | -0/+28 |
|/ / | |||||
* | | Merge pull request #1235 from detiber/cluster_hosts | Brenton Leanhardt | 2016-01-21 | 4 | -64/+44 |
|\ \ | | | | | | | Update cluster_hosts.yml for cloud providers | ||||
| * | | Update cluster_hosts.yml for cloud providers | Jason DeTiberus | 2016-01-19 | 4 | -64/+44 |
| | | | | | | | | | | | | | | | | | | - Add g_infra_hosts (nodes with sub-type infra) - Add g_compute_hosts (nodes with sub-type compute) - Reduce duplication by re-using previously defined variables | ||||
* | | | Merge pull request #1251 from abutcher/pcs-status | Brenton Leanhardt | 2016-01-21 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix 'pcs status' validation filter | ||||
| * | | | Test validate_pcs_cluster input is basestring instead of str. | Andrew Butcher | 2016-01-21 | 1 | -2/+2 |
|/ / / | |||||
| | * | Merge pull request #1247 from openshift/master | Matt Woodson | 2016-01-20 | 31 | -260/+210 |
| | |\ | |_|/ |/| | | Merge master into prod | ||||
* | | | Merge pull request #1244 from abutcher/api-sysconfig | Brenton Leanhardt | 2016-01-20 | 3 | -2/+5 |
|\ \ \ | | | | | | | | | Native ha port fixes | ||||
| * | | | Use haproxy frontend port for os_firewall. | Andrew Butcher | 2016-01-20 | 2 | -1/+4 |
| | | | | |||||
| * | | | Fix native master api sysconfig. | Andrew Butcher | 2016-01-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1246 from mwoodson/env_hostgroups | Matt Woodson | 2016-01-20 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | oso_host_monitoring: added environment as a var to the host monitoring systemd script | ||||
| * | | | | oso_host_monitoring: added environment as a var to the host monitoring ↵ | Matt Woodson | 2016-01-20 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | systemd script | ||||
* | | | | Merge pull request #1245 from abutcher/upgrade-certs | Brenton Leanhardt | 2016-01-20 | 1 | -3/+27 |
|\ \ \ \ | | | | | | | | | | | Check master certificates during upgrade. | ||||
| * | | | | Check master certificates during upgrade. | Andrew Butcher | 2016-01-20 | 1 | -3/+27 |
| |/ / / | |||||
* | | | | Merge pull request #1243 from jstuever/podevictiontimeout | Brenton Leanhardt | 2016-01-20 | 5 | -1/+11 |
|\ \ \ \ | |/ / / |/| | | | Enable kubernetes master config of podEvictionTimeout from ansible | ||||
| * | | | Enable kubernetes master config of podEvictionTimeout from ansible | Jeremiah Stuever | 2016-01-20 | 5 | -1/+11 |
|/ / / | |||||
* | | | Merge pull request #1240 from abutcher/wrapper-pathing | Brenton Leanhardt | 2016-01-20 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Fix client and admin wrapper pathing for non-root user install. | ||||
| * | | | Fix wrapper pathing for non-root user install. | Andrew Butcher | 2016-01-19 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #1175 from detiber/ha_port_fixes | Brenton Leanhardt | 2016-01-19 | 16 | -114/+146 |
|\ \ \ | | | | | | | | | Ha port fixes | ||||
| * | | | Fix hardcoded api_port in openshift_master_cluster | Jason DeTiberus | 2016-01-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | Use local address for loopback kubeconfig | Jason DeTiberus | 2016-01-14 | 4 | -47/+92 |
| | | | | |||||
| * | | | consolidate steps and cleanup template dir | Jason DeTiberus | 2016-01-14 | 12 | -65/+51 |
| | | | | |||||
| * | | | Controllers_port and firewall rules | Diego Castro | 2016-01-12 | 4 | -5/+7 |
| | | | | |||||
| * | | | Fix bind address/port when isn't default | Diego Castro | 2016-01-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1118 from detiber/os_firewall_disable | Brenton Leanhardt | 2016-01-19 | 2 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | Add ability to disable os_firewall | ||||
| * | | | Add ability to disable os_firewall | Jason DeTiberus | 2016-01-05 | 2 | -2/+3 |
| | | | | |||||
* | | | | Merge pull request #1234 from kwoodson/remove_ruby | Kenny Woodson | 2016-01-19 | 2 | -117/+0 |
|\ \ \ \ | | | | | | | | | | | Removing ruby scripts. | ||||
| * | | | | Removing ruby scripts and replacing with python. | Kenny Woodson | 2016-01-19 | 2 | -117/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1233 from kwoodson/remove_ruby | Kenny Woodson | 2016-01-19 | 1 | -3/+4 |
|\| | | | | | | | | | | | | | | Fix for python yaml_validation. | ||||
| * | | | | Fixed a logic bug and yaml load | Kenny Woodson | 2016-01-19 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | Merge pull request #1231 from kwoodson/remove_ruby | Kenny Woodson | 2016-01-19 | 1 | -5/+9 |
|\| | | | | | | | | | | | | | | Fix for python yaml_validation and renmae. | ||||
| * | | | | Fixing yaml validation in python. Inputs behave differently as does glob | Kenny Woodson | 2016-01-19 | 1 | -5/+9 |
| | | | | | |||||
* | | | | | Merge pull request #1144 from detiber/gce_sdn | Brenton Leanhardt | 2016-01-19 | 4 | -14/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove default disable of SDN for GCE | ||||
| * | | | | | Remove default disable of SDN for GCE | Jason DeTiberus | 2016-01-15 | 4 | -14/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update openshift_facts to no longer default use_openshift_sdn for GCE installs - Remove workarounds in the GCE playbooks that were forcing SDN configuration | ||||
| | | | | * | Merge pull request #1230 from openshift/master | Kenny Woodson | 2016-01-19 | 2 | -0/+159 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | Master into prod | ||||
* | | | | | | Merge pull request #1217 from kwoodson/remove_ruby | Kenny Woodson | 2016-01-19 | 2 | -0/+159 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Removing ruby scripts and adding python ones. | ||||
| * | | | | | Removing removing scripts and moving to python. | Kenny Woodson | 2016-01-19 | 2 | -0/+159 |
| | | | | | | |||||
| | | | | * | Merge pull request #1227 from openshift/master | Matt Woodson | 2016-01-19 | 3 | -0/+4 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | Merge master into prod | ||||
* | | | | | | Merge pull request #1226 from mwoodson/zabbix_libs | Matt Woodson | 2016-01-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | oso_monitoring: add the zabbix libs | ||||
| * | | | | | | oso_monitoring: add the zabbix libs | Matt Woodson | 2016-01-19 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1225 from joelddiaz/disable-new-dns | Joel Diaz | 2016-01-19 | 2 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add ability to disable ztriggers and disable new container dns check | ||||
| * | | | | | | add ability to disable ztriggers and disable new container dns check | Joel Diaz | 2016-01-19 | 2 | -0/+3 |
| | | | | | | | |||||
| | | | | | * | Merge pull request #1222 from openshift/master | Kenny Woodson | 2016-01-18 | 2 | -2/+8 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | Automatic commit of package [openshift-ansible] release [3.0.35-1]. | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.0.35-1]. | Brenton Leanhardt | 2016-01-18 | 2 | -2/+8 |
| | | | | | | | |||||
| | | | | | * | Merge pull request #1220 from openshift/master | Matt Woodson | 2016-01-18 | 9 | -1/+216 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | Merge master into prod | ||||
* | | | | | | | Merge pull request #1211 from abutcher/pacemaker-master-check | Brenton Leanhardt | 2016-01-18 | 1 | -1/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve pacemaker 'is-active' check. | ||||
| * | | | | | | | Improve pacemaker 'is-active' check. | Andrew Butcher | 2016-01-18 | 1 | -1/+9 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1218 from mwoodson/chrony | Matt Woodson | 2016-01-18 | 8 | -0/+207 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | new role: chrony so that servers can use ntp |