summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1256 from openshift/masterThomas Wiest2016-01-217-66/+74
|\ | | | | sync master -> prod branch
| * Merge pull request #1254 from twiest/prThomas Wiest2016-01-212-0/+28
| |\ | | | | | | Added template for config loop.
| | * Added template for config loop.Thomas Wiest2016-01-212-0/+28
| |/
| * Merge pull request #1235 from detiber/cluster_hostsBrenton Leanhardt2016-01-214-64/+44
| |\ | | | | | | Update cluster_hosts.yml for cloud providers
| | * Update cluster_hosts.yml for cloud providersJason DeTiberus2016-01-194-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-statusBrenton Leanhardt2016-01-211-2/+2
| |\ \ | | | | | | | | Fix 'pcs status' validation filter
| | * | Test validate_pcs_cluster input is basestring instead of str.Andrew Butcher2016-01-211-2/+2
| |/ /
* | | Merge pull request #1247 from openshift/masterMatt Woodson2016-01-2031-260/+210
|\| | | | | | | | Merge master into prod
| * | Merge pull request #1244 from abutcher/api-sysconfigBrenton Leanhardt2016-01-203-2/+5
| |\ \ | | | | | | | | Native ha port fixes
| | * | Use haproxy frontend port for os_firewall.Andrew Butcher2016-01-202-1/+4
| | | |
| | * | Fix native master api sysconfig.Andrew Butcher2016-01-201-1/+1
| | | |
| * | | Merge pull request #1246 from mwoodson/env_hostgroupsMatt Woodson2016-01-201-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 Woodson2016-01-201-0/+1
| |/ / / | | | | | | | | | | | | systemd script
| * | | Merge pull request #1245 from abutcher/upgrade-certsBrenton Leanhardt2016-01-201-3/+27
| |\ \ \ | | | | | | | | | | Check master certificates during upgrade.
| | * | | Check master certificates during upgrade.Andrew Butcher2016-01-201-3/+27
| | |/ /
| * | | Merge pull request #1243 from jstuever/podevictiontimeoutBrenton Leanhardt2016-01-205-1/+11
| |\ \ \ | | |/ / | |/| | Enable kubernetes master config of podEvictionTimeout from ansible
| | * | Enable kubernetes master config of podEvictionTimeout from ansibleJeremiah Stuever2016-01-205-1/+11
| |/ /
| * | Merge pull request #1240 from abutcher/wrapper-pathingBrenton Leanhardt2016-01-201-0/+4
| |\ \ | | | | | | | | Fix client and admin wrapper pathing for non-root user install.
| | * | Fix wrapper pathing for non-root user install.Andrew Butcher2016-01-191-0/+4
| | |/
| * | Merge pull request #1175 from detiber/ha_port_fixesBrenton Leanhardt2016-01-1916-114/+146
| |\ \ | | | | | | | | Ha port fixes
| | * | Fix hardcoded api_port in openshift_master_clusterJason DeTiberus2016-01-141-2/+1
| | | |
| | * | Use local address for loopback kubeconfigJason DeTiberus2016-01-144-47/+92
| | | |
| | * | consolidate steps and cleanup template dirJason DeTiberus2016-01-1412-65/+51
| | | |
| | * | Controllers_port and firewall rulesDiego Castro2016-01-124-5/+7
| | | |
| | * | Fix bind address/port when isn't defaultDiego Castro2016-01-121-1/+1
| | | |
| * | | Merge pull request #1118 from detiber/os_firewall_disableBrenton Leanhardt2016-01-192-2/+3
| |\ \ \ | | |_|/ | |/| | Add ability to disable os_firewall
| | * | Add ability to disable os_firewallJason DeTiberus2016-01-052-2/+3
| | | |
| * | | Merge pull request #1234 from kwoodson/remove_rubyKenny Woodson2016-01-192-117/+0
| |\ \ \ | | | | | | | | | | Removing ruby scripts.
| | * | | Removing ruby scripts and replacing with python.Kenny Woodson2016-01-192-117/+0
| | | | |
| * | | | Merge pull request #1233 from kwoodson/remove_rubyKenny Woodson2016-01-191-3/+4
| |\| | | | | | | | | | | | | Fix for python yaml_validation.
| | * | | Fixed a logic bug and yaml loadKenny Woodson2016-01-191-3/+4
| | | | |
| * | | | Merge pull request #1231 from kwoodson/remove_rubyKenny Woodson2016-01-191-5/+9
| |\| | | | | | | | | | | | | Fix for python yaml_validation and renmae.
| | * | | Fixing yaml validation in python. Inputs behave differently as does globKenny Woodson2016-01-191-5/+9
| | | | |
| * | | | Merge pull request #1144 from detiber/gce_sdnBrenton Leanhardt2016-01-194-14/+1
| |\ \ \ \ | | | | | | | | | | | | Remove default disable of SDN for GCE
| | * | | | Remove default disable of SDN for GCEJason DeTiberus2016-01-154-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/masterKenny Woodson2016-01-192-0/+159
|\| | | | | | | | | | | | | | | | | Master into prod
| * | | | | Merge pull request #1217 from kwoodson/remove_rubyKenny Woodson2016-01-192-0/+159
| |\ \ \ \ \ | | | |/ / / | | |/| | | Removing ruby scripts and adding python ones.
| | * | | | Removing removing scripts and moving to python.Kenny Woodson2016-01-192-0/+159
| | | | | |
* | | | | | Merge pull request #1227 from openshift/masterMatt Woodson2016-01-193-0/+4
|\| | | | | | | | | | | | | | | | | Merge master into prod
| * | | | | Merge pull request #1226 from mwoodson/zabbix_libsMatt Woodson2016-01-191-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | oso_monitoring: add the zabbix libs
| | * | | | | oso_monitoring: add the zabbix libsMatt Woodson2016-01-191-0/+1
| |/ / / / /
| * | | | | Merge pull request #1225 from joelddiaz/disable-new-dnsJoel Diaz2016-01-192-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | add ability to disable ztriggers and disable new container dns check
| | * | | | | add ability to disable ztriggers and disable new container dns checkJoel Diaz2016-01-192-0/+3
| | | | | | |
* | | | | | | Merge pull request #1222 from openshift/masterKenny Woodson2016-01-182-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 Leanhardt2016-01-182-2/+8
| | | | | | |
* | | | | | | Merge pull request #1220 from openshift/masterMatt Woodson2016-01-189-1/+216
|\| | | | | | | | | | | | | | | | | | | | Merge master into prod
| * | | | | | Merge pull request #1211 from abutcher/pacemaker-master-checkBrenton Leanhardt2016-01-181-1/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve pacemaker 'is-active' check.
| | * | | | | | Improve pacemaker 'is-active' check.Andrew Butcher2016-01-181-1/+9
| | | | | | | |
| * | | | | | | Merge pull request #1218 from mwoodson/chronyMatt Woodson2016-01-188-0/+207
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | new role: chrony so that servers can use ntp
| | * | | | | | | added the lib_timedate roleMatt Woodson2016-01-184-4/+78
| | | | | | | | |