Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1538 from joelddiaz/lib_zabbix-imports | Joel Diaz | 2016-03-03 | 18 | -18/+18 |
|\ | | | | | change lib_zabbix's import to new pathing | ||||
| * | change lib_zabbix's import to new pathing | Joel Diaz | 2016-03-03 | 18 | -18/+18 |
|/ | |||||
* | Merge pull request #1524 from detiber/haproxy_tuning | Brenton Leanhardt | 2016-03-03 | 2 | -4/+6 |
|\ | | | | | Increase maxconn settings for haproxy lb | ||||
| * | disable http-server-close option | Jason DeTiberus | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | Increase maxconn settings for haproxy lb | Jason DeTiberus | 2016-02-29 | 2 | -3/+5 |
| | | |||||
* | | Merge pull request #1537 from abutcher/bz1313169-oadm | Brenton Leanhardt | 2016-03-03 | 1 | -1/+1 |
|\ \ | | | | | | | Check for is_containerized value when setting binary locations. | ||||
| * | | Check for is_containerized value when setting binary locations. | Andrew Butcher | 2016-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1528 from vishpat/nuage_rest_server_cert_changes | Brenton Leanhardt | 2016-03-03 | 16 | -4/+251 |
|\ \ \ | |/ / |/| | | Changes required for Nuage monitor REST server | ||||
| * | | Changes required for Nuage monitor REST server | Vishal Patil | 2016-03-01 | 16 | -4/+251 |
| |/ | |||||
* | | Merge pull request #1533 from brenton/bz1313169 | Brenton Leanhardt | 2016-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Bug 1313169 - Ansible installer tries to enable etcd_container servic… | ||||
| * | | Bug 1313169 - Ansible installer tries to enable etcd_container service even ↵ | Brenton Leanhardt | 2016-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | though containerized=false | ||||
* | | | Merge pull request #1534 from dgoodwin/infra-versions | Brenton Leanhardt | 2016-03-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix logging infra template version mismatch. | ||||
| * | | Fix logging infra template version mismatch. | Devan Goodwin | 2016-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Metrics was updated to 3.1.1, logging was not. | ||||
* | | | Merge pull request #1530 from joelddiaz/zbx-action-Heal | Joel Diaz | 2016-03-01 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | change [HEAL] to [Heal] to match with v2 | ||||
| * | | | change [HEAL] to [Heal] to match with v2 | Joel Diaz | 2016-03-01 | 2 | -3/+3 |
| | | | | |||||
* | | | | Automatic commit of package [openshift-ansible] release [3.0.49-1]. | Matt Woodson | 2016-03-01 | 2 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #1531 from mwoodson/ohi_fix | Matt Woodson | 2016-03-01 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | ohi: fixed error in awsutil.py | ||||
| * | | | fixed error in awsutil.py | Matt Woodson | 2016-03-01 | 1 | -2/+1 |
| | | | | |||||
* | | | | Automatic commit of package [openshift-ansible] release [3.0.48-1]. | Matt Woodson | 2016-03-01 | 2 | -2/+66 |
| | | | | |||||
* | | | | Merge pull request #1527 from mwoodson/ohi_fix | Matt Woodson | 2016-03-01 | 2 | -1/+29 |
|\| | | | | | | | | | | | ohi: added subtype searching | ||||
| * | | | ohi: added subtype searching | Matt Woodson | 2016-03-01 | 2 | -1/+29 |
| | |/ | |/| | |||||
* | | | Merge pull request #1529 from joelddiaz/generic-remote-actions | Joel Diaz | 2016-03-01 | 2 | -31/+31 |
|\ \ \ | |/ / |/| | | make heal remote actions generic for all [HEAL] triggers | ||||
| * | | make heal remote actions generic for all [HEAL] triggers | Joel Diaz | 2016-03-01 | 2 | -31/+31 |
|/ / | |||||
* | | Merge pull request #1521 from mwoodson/docker_lvm | Matt Woodson | 2016-02-29 | 9 | -88/+139 |
|\ \ | | | | | | | role: added docker_storage_setup | ||||
| * | | added extra steps to ensure docker starts up | Matt Woodson | 2016-02-29 | 1 | -1/+14 |
| | | | |||||
| * | | role_removal: docker_storage; This is the old way, no longer used | Matt Woodson | 2016-02-29 | 6 | -88/+0 |
| | | | |||||
| * | | role: added docker_storage_setup | Matt Woodson | 2016-02-29 | 4 | -2/+128 |
| | | | |||||
* | | | Merge pull request #1514 from cgwalters/containerized-ah-root-docs | Brenton Leanhardt | 2016-02-29 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | docs: Explain a bit more how to expand Atomic Host rootfs | ||||
| * | | | docs: Explain a bit more how to expand Atomic Host rootfs | Colin Walters | 2016-02-28 | 1 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #1519 from brenton/master | Brenton Leanhardt | 2016-02-29 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | Adding a symlink to making loading the examples more convenient | ||||
| * | | | Adding a symlink to making loading the examples more convenient | Brenton Leanhardt | 2016-02-29 | 1 | -0/+1 |
| |/ / | | | | | | | | | | This is related to https://bugzilla.redhat.com/show_bug.cgi?id=1300503 | ||||
* | | | Merge pull request #1520 from abutcher/hostvarsFix | Brenton Leanhardt | 2016-02-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix hostvars key in openshift_master_certificates | ||||
| * | | Use inventory_hostname for openshift master certs to sync. | Andrew Butcher | 2016-02-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1510 from ↵ | Brenton Leanhardt | 2016-02-26 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | smunilla/rename_to_openshift_master_default_subdomain a-o-i: Rename osm_default_subdomain | ||||
| * | | a-o-i: Rename osm_default_subdomain | Samuel Munilla | 2016-02-26 | 1 | -1/+1 |
|/ / | | | | | | | | | Rename osm_default_subdomain to openshift_master_default_subdomain to match PR1495. | ||||
* | | Merge pull request #1509 from brenton/master | Brenton Leanhardt | 2016-02-26 | 1 | -0/+5 |
|\ \ | | | | | | | Updating tito config for OSE 3.2 | ||||
| * | | Updating tito config for OSE 3.2 | Brenton Leanhardt | 2016-02-26 | 1 | -0/+5 |
|/ / | |||||
* | | Merge pull request #1506 from abutcher/sync-configs | Brenton Leanhardt | 2016-02-26 | 2 | -1/+39 |
|\ \ | | | | | | | Synchronize master kube configs | ||||
| * | | Synchronize master kube configs | Andrew Butcher | 2016-02-26 | 2 | -1/+39 |
| | | | |||||
* | | | Merge pull request #1499 from abutcher/readme-warnings | Brenton Leanhardt | 2016-02-26 | 6 | -0/+15 |
|\ \ \ | | | | | | | | | Add warnings for bin/cluster and READMEs | ||||
| * | | | Add warnings to bin/cluster and READMEs | Andrew Butcher | 2016-02-25 | 6 | -0/+15 |
| | | | | |||||
* | | | | Merge pull request #1504 from cben/centos-7-1602 | Brenton Leanhardt | 2016-02-26 | 2 | -5/+3 |
|\ \ \ \ | | | | | | | | | | | libvirt: Upgrade to CentOS-7-x86_64-GenericCloud-1602. | ||||
| * | | | | Upgrade -1510 to CentOS-7-x86_64-GenericCloud-1602. | Beni Cherniavsky-Paskin | 2016-02-25 | 2 | -5/+3 |
| | | | | | |||||
| * | | | | Pin down CentOS-7-x86_64-GenericCloud-1510.qcow2.xz version, | Beni Cherniavsky-Paskin | 2016-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | which the checksum currently expects (#1384). | ||||
* | | | | | Merge pull request #1505 from mwoodson/os_utils | Matt Woodson | 2016-02-26 | 3 | -5/+33 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | added os_utils, os_reboot_server role; removed containerization stuff from the updated | ||||
| * | | | | added os_utils, os_reboot_server role; removed containerization stuff from ↵ | Matt Woodson | 2016-02-26 | 3 | -5/+33 |
| | | | | | | | | | | | | | | | | | | | | the updated | ||||
* | | | | | Merge pull request #1495 from jstuever/rename_osm_default_subdomain | Brenton Leanhardt | 2016-02-25 | 4 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Rename variable to openshift_master_default_subdomain | ||||
| * | | | | | Rename variable to openshift_master_default_subdomain with backwards ↵ | Jeremiah Stuever | 2016-02-25 | 4 | -4/+4 |
| | |/ / / | |/| | | | | | | | | | | | | | compatibility. | ||||
* | | | | | Merge pull request #1462 from jkhelil/configure_log_level_from_cli | Brenton Leanhardt | 2016-02-25 | 2 | -0/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | configure debug_level for master and node from cli | ||||
| * | | | | configure debug_level for master and node from cli | jawed | 2016-02-23 | 2 | -0/+9 |
| | | | | |