summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1325 from abutcher/fix-scaleupBrenton Leanhardt2016-02-024-3/+6
|\
| * Do not apply the etcd_certificates role during node playbook.Andrew Butcher2016-02-022-2/+3
| * Add g_new_node_hosts to cluster_hosts.Andrew Butcher2016-02-022-1/+3
* | Merge pull request #1238 from detiber/gce_fixesThomas Wiest2016-02-0212-115/+96
|\ \
| * | Improve docs and consistency of setting the ssh_userJason DeTiberus2016-02-028-19/+39
| * | remove outdated commentsJason DeTiberus2016-02-022-5/+0
| * | add etcd hosts for gce playbooksJason DeTiberus2016-02-021-0/+11
| * | GCE cloud provider updatesJason DeTiberus2016-02-027-94/+49
|/ /
* | Merge pull request #1323 from jstuever/1312Brenton Leanhardt2016-02-023-3/+3
|\ \ | |/ |/|
| * Updating examples to use /etc/origin/master/htpasswdJeremiah Stuever2016-02-023-3/+3
|/
* Merge pull request #1019 from dgoodwin/etcd-serialBrenton Leanhardt2016-02-021-2/+26
|\
| * Bring first etcd server up before others.Devan Goodwin2015-12-111-2/+26
* | Automatic commit of package [openshift-ansible] release [3.0.38-1].Brenton Leanhardt2016-02-022-2/+26
* | Merge pull request #1293 from smunilla/default_subdomainBrenton Leanhardt2016-02-024-1/+21
|\ \
| * | aoi: Ask for osm_default_subdomain in interactive modeSamuel Munilla2016-02-024-1/+21
|/ /
* | Merge pull request #1303 from talset/s3_registry_clusteridStefanie Forrester2016-02-011-1/+1
|\ \
| * | s3_registry no filter named 'lookup'talset2016-01-291-1/+1
* | | Merge pull request #1296 from rharrison10/rharriso/lib_dynRussell Harrison2016-02-014-0/+334
|\ \ \
| * | | removing extraneous commentsRussell Harrison2016-01-311-118/+4
| * | | Remove commented lines and fix pylint checkRussell Harrison2016-01-291-10/+5
| * | | Cleaning up the dyn ansible module for mergingRussell Harrison2016-01-295-26/+12
| * | | Fixing last pylint errorRussell Harrison2016-01-291-0/+3
| * | | Fixing pylint errorsRussell Harrison2016-01-291-29/+28
| * | | WIP adding the lib_dyn role for the dyn_record moduleRussell Harrison2016-01-287-0/+465
* | | | Merge pull request #1321 from joelddiaz/ovs-rules-itemJoel Diaz2016-02-011-0/+6
|\ \ \ \
| * | | | add item to hold number of stray OVS rules found/removedJoel Diaz2016-02-011-0/+6
* | | | | Merge pull request #1319 from mwoodson/docker_storageMatt Woodson2016-02-011-1/+1
|\ \ \ \ \
| * | | | | changed adhoc playbook to match new host monitoring containerMatt Woodson2016-02-011-1/+1
|/ / / / /
* | | | | Merge pull request #1309 from detiber/multi-masterStefanie Forrester2016-02-014-0/+4
|\ \ \ \ \
| * | | | | Multi-master fixes for provider playbooksJason DeTiberus2016-02-014-0/+4
* | | | | | Merge pull request #1310 from detiber/aws_hostnameStefanie Forrester2016-02-012-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix hostname for aws cloud providerJason DeTiberus2016-01-292-2/+0
* | | | | | Merge pull request #1237 from detiber/infra_fixesBrenton Leanhardt2016-02-0110-75/+151
|\ \ \ \ \ \
| * | | | | | Added docs around oo_nodes_with_labelJason DeTiberus2016-02-011-49/+75
| * | | | | | fix for terminateJason DeTiberus2016-02-011-1/+1
| * | | | | | Fix node tags for aws providerJason DeTiberus2016-02-011-1/+1
| * | | | | | use yaml for loading lable info instead of jsonJason DeTiberus2016-02-011-1/+1
| * | | | | | infra_node fixesJason DeTiberus2016-02-019-30/+80
* | | | | | | Merge pull request #1316 from mwoodson/master_localMatt Woodson2016-02-011-2/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | zabbix: added master local api items and triggersMatt Woodson2016-02-011-2/+25
* | | | | | | Merge pull request #1304 from jprovaznik/sleepBrenton Leanhardt2016-02-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Give openvswitch container some time to startJan Provaznik2016-01-291-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1311 from sdodson/is-syncBrenton Leanhardt2016-02-015-109/+123
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix missing bool filterScott Dodson2016-01-291-1/+1
| * | | | | Sync platest imagestreamsScott Dodson2016-01-294-108/+122
* | | | | | Automatic commit of package [openshift-ansible] release [3.0.37-1].Kenny Woodson2016-01-292-2/+36
* | | | | | Merge pull request #1313 from kwoodson/ohi_ipsKenny Woodson2016-01-294-16/+52
|\ \ \ \ \ \
| * | | | | | Adding ip address optionKenny Woodson2016-01-294-16/+52
| |/ / / / /
* | | | | | Merge pull request #1114 from lhuard1A/fix_update_repos_and_packagesBrenton Leanhardt2016-01-293-2/+4
|\ \ \ \ \ \
| * | | | | | Move the `is_atomic` check from `update_repos_and_packages.yml` to `rhel_subs...Lénaïc Huard2016-01-123-2/+4