summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1538 from joelddiaz/lib_zabbix-importsJoel Diaz2016-03-0318-18/+18
|\ | | | | change lib_zabbix's import to new pathing
| * change lib_zabbix's import to new pathingJoel Diaz2016-03-0318-18/+18
|/
* Merge pull request #1524 from detiber/haproxy_tuningBrenton Leanhardt2016-03-032-4/+6
|\ | | | | Increase maxconn settings for haproxy lb
| * disable http-server-close optionJason DeTiberus2016-03-011-1/+1
| |
| * Increase maxconn settings for haproxy lbJason DeTiberus2016-02-292-3/+5
| |
* | Merge pull request #1537 from abutcher/bz1313169-oadmBrenton Leanhardt2016-03-031-1/+1
|\ \ | | | | | | Check for is_containerized value when setting binary locations.
| * | Check for is_containerized value when setting binary locations.Andrew Butcher2016-03-021-1/+1
| | |
* | | Merge pull request #1528 from vishpat/nuage_rest_server_cert_changesBrenton Leanhardt2016-03-0316-4/+251
|\ \ \ | |/ / |/| | Changes required for Nuage monitor REST server
| * | Changes required for Nuage monitor REST serverVishal Patil2016-03-0116-4/+251
| |/
* | Merge pull request #1533 from brenton/bz1313169Brenton Leanhardt2016-03-021-1/+1
|\ \ | | | | | | Bug 1313169 - Ansible installer tries to enable etcd_container servic…
| * | Bug 1313169 - Ansible installer tries to enable etcd_container service even ↵Brenton Leanhardt2016-03-021-1/+1
| | | | | | | | | | | | though containerized=false
* | | Merge pull request #1534 from dgoodwin/infra-versionsBrenton Leanhardt2016-03-021-1/+1
|\ \ \ | |/ / |/| | Fix logging infra template version mismatch.
| * | Fix logging infra template version mismatch.Devan Goodwin2016-03-021-1/+1
| | | | | | | | | | | | Metrics was updated to 3.1.1, logging was not.
* | | Merge pull request #1530 from joelddiaz/zbx-action-HealJoel Diaz2016-03-012-3/+3
|\ \ \ | | | | | | | | change [HEAL] to [Heal] to match with v2
| * | | change [HEAL] to [Heal] to match with v2Joel Diaz2016-03-012-3/+3
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.49-1].Matt Woodson2016-03-012-2/+5
| | | |
* | | | Merge pull request #1531 from mwoodson/ohi_fixMatt Woodson2016-03-011-2/+1
|\ \ \ \ | |/ / / |/| | | ohi: fixed error in awsutil.py
| * | | fixed error in awsutil.pyMatt Woodson2016-03-011-2/+1
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.48-1].Matt Woodson2016-03-012-2/+66
| | | |
* | | | Merge pull request #1527 from mwoodson/ohi_fixMatt Woodson2016-03-012-1/+29
|\| | | | | | | | | | | ohi: added subtype searching
| * | | ohi: added subtype searchingMatt Woodson2016-03-012-1/+29
| | |/ | |/|
* | | Merge pull request #1529 from joelddiaz/generic-remote-actionsJoel Diaz2016-03-012-31/+31
|\ \ \ | |/ / |/| | make heal remote actions generic for all [HEAL] triggers
| * | make heal remote actions generic for all [HEAL] triggersJoel Diaz2016-03-012-31/+31
|/ /
* | Merge pull request #1521 from mwoodson/docker_lvmMatt Woodson2016-02-299-88/+139
|\ \ | | | | | | role: added docker_storage_setup
| * | added extra steps to ensure docker starts upMatt Woodson2016-02-291-1/+14
| | |
| * | role_removal: docker_storage; This is the old way, no longer usedMatt Woodson2016-02-296-88/+0
| | |
| * | role: added docker_storage_setupMatt Woodson2016-02-294-2/+128
| | |
* | | Merge pull request #1514 from cgwalters/containerized-ah-root-docsBrenton Leanhardt2016-02-291-3/+7
|\ \ \ | | | | | | | | docs: Explain a bit more how to expand Atomic Host rootfs
| * | | docs: Explain a bit more how to expand Atomic Host rootfsColin Walters2016-02-281-3/+7
| | | |
* | | | Merge pull request #1519 from brenton/masterBrenton Leanhardt2016-02-291-0/+1
|\ \ \ \ | |_|/ / |/| | | Adding a symlink to making loading the examples more convenient
| * | | Adding a symlink to making loading the examples more convenientBrenton Leanhardt2016-02-291-0/+1
| |/ / | | | | | | | | | This is related to https://bugzilla.redhat.com/show_bug.cgi?id=1300503
* | | Merge pull request #1520 from abutcher/hostvarsFixBrenton Leanhardt2016-02-291-1/+1
|\ \ \ | |/ / |/| | Fix hostvars key in openshift_master_certificates
| * | Use inventory_hostname for openshift master certs to sync.Andrew Butcher2016-02-291-1/+1
|/ /
* | Merge pull request #1510 from ↵Brenton Leanhardt2016-02-261-1/+1
|\ \ | | | | | | | | | | | | smunilla/rename_to_openshift_master_default_subdomain a-o-i: Rename osm_default_subdomain
| * | a-o-i: Rename osm_default_subdomainSamuel Munilla2016-02-261-1/+1
|/ / | | | | | | | | Rename osm_default_subdomain to openshift_master_default_subdomain to match PR1495.
* | Merge pull request #1509 from brenton/masterBrenton Leanhardt2016-02-261-0/+5
|\ \ | | | | | | Updating tito config for OSE 3.2
| * | Updating tito config for OSE 3.2Brenton Leanhardt2016-02-261-0/+5
|/ /
* | Merge pull request #1506 from abutcher/sync-configsBrenton Leanhardt2016-02-262-1/+39
|\ \ | | | | | | Synchronize master kube configs
| * | Synchronize master kube configsAndrew Butcher2016-02-262-1/+39
| | |
* | | Merge pull request #1499 from abutcher/readme-warningsBrenton Leanhardt2016-02-266-0/+15
|\ \ \ | | | | | | | | Add warnings for bin/cluster and READMEs
| * | | Add warnings to bin/cluster and READMEsAndrew Butcher2016-02-256-0/+15
| | | |
* | | | Merge pull request #1504 from cben/centos-7-1602Brenton Leanhardt2016-02-262-5/+3
|\ \ \ \ | | | | | | | | | | libvirt: Upgrade to CentOS-7-x86_64-GenericCloud-1602.
| * | | | Upgrade -1510 to CentOS-7-x86_64-GenericCloud-1602.Beni Cherniavsky-Paskin2016-02-252-5/+3
| | | | |
| * | | | Pin down CentOS-7-x86_64-GenericCloud-1510.qcow2.xz version,Beni Cherniavsky-Paskin2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | which the checksum currently expects (#1384).
* | | | | Merge pull request #1505 from mwoodson/os_utilsMatt Woodson2016-02-263-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 Woodson2016-02-263-5/+33
| | | | | | | | | | | | | | | | | | | | the updated
* | | | | Merge pull request #1495 from jstuever/rename_osm_default_subdomainBrenton Leanhardt2016-02-254-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Rename variable to openshift_master_default_subdomain
| * | | | | Rename variable to openshift_master_default_subdomain with backwards ↵Jeremiah Stuever2016-02-254-4/+4
| | |/ / / | |/| | | | | | | | | | | | | compatibility.
* | | | | Merge pull request #1462 from jkhelil/configure_log_level_from_cliBrenton Leanhardt2016-02-252-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | configure debug_level for master and node from cli
| * | | | configure debug_level for master and node from clijawed2016-02-232-0/+9
| | | | |