summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1307 from abutcher/containerized-cockpitBrenton Leanhardt2016-01-291-1/+1
|\
| * Enable cockpit when not is_atomic.Andrew Butcher2016-01-291-1/+1
* | Merge pull request #1301 from vishpat/bug1299Brenton Leanhardt2016-01-291-0/+4
|\ \ | |/ |/|
| * Explicitly restart the atomic node service after configuring it for nuageVishal Patil2016-01-281-0/+4
|/
* Merge pull request #1264 from gaelL/s3_registry_templateStefanie Forrester2016-01-281-0/+3
|\
| * adhoc s3 registry - add auth part in the registry config samplegaelL2016-01-221-0/+3
* | Merge pull request #1265 from talset/s3_registry_clusteridStefanie Forrester2016-01-282-4/+6
|\ \
| * | Allow to have custom bucket name and regiontalset2016-01-282-4/+6
| |/
* | Merge pull request #1288 from abutcher/container-logrotateBrenton Leanhardt2016-01-287-3/+13
|\ \
| * | Add inventory example for logrotate_scriptsAndrew Butcher2016-01-283-0/+12
| * | Configure logrotate on atomic.Andrew Butcher2016-01-274-3/+1
* | | Merge pull request #1294 from kwoodson/yaml_fixKenny Woodson2016-01-281-1/+6
|\ \ \
| * | | fixing logic for skipping symlinksKenny Woodson2016-01-281-1/+6
|/ / /
* | | Merge pull request #1290 from joelddiaz/sky-templateJoel Diaz2016-01-281-2/+2
|\ \ \
| * | | fix template trigger calcJoel Diaz2016-01-281-2/+2
| |/ /
* | | Merge pull request #1292 from brenton/masterBrenton Leanhardt2016-01-281-3/+3
|\ \ \ | |/ / |/| |
| * | Minor readme cleanup for Bug 1271566Brenton Leanhardt2016-01-281-3/+3
|/ /
* | Merge pull request #1286 from kwoodson/zbx_host_fixKenny Woodson2016-01-261-1/+20
|\ \
| * | Comparing zbx_host interfaces and removing duplicate hostgroup_namesKenny Woodson2016-01-261-1/+20
* | | Merge pull request #1273 from lhuard1A/fix_oo_pretty_print_clusterThomas Wiest2016-01-261-19/+21
|\ \ \
| * | | Fix oo_pretty_print_cluster following the renaming of `env` into `clusterid`Lénaïc Huard2016-01-261-19/+21
* | | | Merge pull request #1274 from rassie/patch-1Brenton Leanhardt2016-01-261-2/+2
|\ \ \ \
| * | | | Fix checking for update package availabilityNikolai Prokoschenko2016-01-261-2/+2
* | | | | Merge pull request #1283 from giuseppe/giuseppe/Dockerfile-require-pyOpenSSLBrenton Leanhardt2016-01-261-1/+1
|\ \ \ \ \
| * | | | | Dockerfile: Require pyOpenSSLGiuseppe Scrivano2016-01-261-1/+1
| |/ / / /
* | | | | Merge pull request #1280 from sjenning/replace-yum-dnfBrenton Leanhardt2016-01-261-1/+1
|\ \ \ \ \
| * | | | | replace yum with dnfSeth Jennings2016-01-261-1/+1
* | | | | | Merge pull request #1279 from abutcher/is-atomic-swapBrenton Leanhardt2016-01-266-9/+8
|\ \ \ \ \ \
| * | | | | | Install cockpit, logrotate and fluentd unless host is atomic.Andrew Butcher2016-01-266-9/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1275 from spinolacastro/datadirBrenton Leanhardt2016-01-261-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Expose data_dirDiego Castro2016-01-261-0/+1
* | | | | | Merge pull request #1270 from detiber/opensslBrenton Leanhardt2016-01-261-0/+4
|\ \ \ \ \ \
| * | | | | | Ensure openssl present for etcd_caJason DeTiberus2016-01-251-0/+4
* | | | | | | Merge pull request #1276 from spinolacastro/pkgversionBrenton Leanhardt2016-01-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | fix pkg_versionDiego Castro2016-01-261-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1278 from kwoodson/master_checksKenny Woodson2016-01-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Updating for host monitoring HA mastersKenny Woodson2016-01-251-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #1277 from mwoodson/skydns_checkMatt Woodson2016-01-261-0/+26
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | zabbix: added the skydns items and triggersMatt Woodson2016-01-261-0/+26
|/ / / / / /
* | | | | | Merge pull request #1253 from detiber/updateMinVersionBrenton Leanhardt2016-01-265-18/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update Docs and test for testing ansible versionJason DeTiberus2016-01-255-18/+10
* | | | | | Merge pull request #1160 from vishpat/nuageBrenton Leanhardt2016-01-2517-2/+255
|\ \ \ \ \ \
| * | | | | | Add Nuage support to openshift ansibleVishal Patil2016-01-2517-2/+255
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.36-1].Kenny Woodson2016-01-252-2/+44
* | | | | | | Merge pull request #1269 from kwoodson/inventory_alias_fixKenny Woodson2016-01-251-7/+8
|\ \ \ \ \ \ \
| * | | | | | | Fixing awsutil to support aliases and v3Kenny Woodson2016-01-251-7/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1236 from detiber/add_nodesThomas Wiest2016-01-252-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove camel case for bin/cluster addNodesJason DeTiberus2016-01-192-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1177 from smunilla/install_storage_on_installBrenton Leanhardt2016-01-251-0/+18
|\ \ \ \ \ \
| * | | | | | v3_0_to_v3_1_upgrade: Remove is_atomic check for upgradesSamuel Munilla2016-01-141-2/+0