summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2285 from dgoodwin/nuke-images-2Scott Dodson2016-08-114-20/+59
|\
| * Improvements for Docker 1.10+ upgrade image nuking.Devan Goodwin2016-08-114-20/+55
| * Shutdown Docker before upgrading the rpm.Devan Goodwin2016-08-101-0/+4
* | Merge pull request #2286 from smunilla/label_infra_nodesScott Dodson2016-08-111-0/+11
|\ \
| * | a-o-i: Automatically Label Nodes as InfraSamuel Munilla2016-08-111-0/+11
* | | Merge pull request #1142 from abutcher/new-certs-who-disScott Dodson2016-08-1115-86/+496
|\ \ \
| * | | Support for redeploying certificates.Andrew Butcher2016-08-1115-86/+496
| |/ /
* | | Merge pull request #2287 from deads2k/qps-typoScott Dodson2016-08-112-4/+4
|\ \ \ | |/ / |/| |
| * | qps typodeads2k2016-08-112-4/+4
|/ /
* | Merge pull request #2062 from smunilla/BZ1329455Scott Dodson2016-08-101-19/+18
|\ \
| * | a-o-i: Restrict installed host checkSamuel Munilla2016-08-101-19/+18
|/ /
* | Merge pull request #2280 from ganhuang/bz#1356823Scott Dodson2016-08-101-0/+7
|\ \
| * | Restrict the middleware stanza contains 'registry' and 'storage' at least on 3.3Gan Huang2016-08-101-1/+3
| * | docker-registry's middleware stanza should contain 'registry' and 'storage' b...Gan Huang2016-08-101-0/+5
| |/
* / Automatic commit of package [openshift-ansible] release [3.3.9-1].Troy Dawson2016-08-102-2/+23
|/
* Merge pull request #2268 from abutcher/ansible-2.2Scott Dodson2016-08-099-35/+53
|\
| * Move storage includes up to main.Andrew Butcher2016-08-083-19/+16
| * Support gathering ansible 2.1/2.2 system factsAndrew Butcher2016-08-081-12/+19
| * Try/except urlparse calls.Andrew Butcher2016-08-081-1/+5
| * with_fileglob no longer supports wildcard prefixes.Andrew Butcher2016-08-085-3/+13
* | Merge pull request #2279 from abutcher/no-volume-zoneScott Dodson2016-08-091-0/+1
|\ \
| * | Enable 'NoVolumeZoneConflict' policy for schedulerAndrew Butcher2016-08-091-0/+1
* | | Merge pull request #2278 from smunilla/BZ1353162Scott Dodson2016-08-095-15/+15
|\ \ \
| * | | a-o-i: Update nosetests for ansible_ssh_userSamuel Munilla2016-08-093-10/+11
| * | | move ansible_ssh_user to deployment, remove ansible_config and ansible_log_pathGan Huang2016-08-092-5/+4
| |/ /
* | | Merge pull request #2275 from ganhuang/bz#1353163Scott Dodson2016-08-091-1/+2
|\ \ \ | |/ / |/| |
| * | Labeling nodes onlyGan Huang2016-08-091-1/+2
|/ /
* | Merge pull request #2261 from richm/ansible2-support-hack-2Scott Dodson2016-08-081-1/+7
|\ \
| * | make the improved log formatter work with ansible 2.1Rich Megginson2016-08-081-1/+7
| |/
* | Merge pull request #2269 from abutcher/etcd-certs-becomeScott Dodson2016-08-081-0/+2
|\ \
| * | Set become=no for etcd server certificates temporary directory.Andrew Butcher2016-08-081-0/+2
* | | Merge pull request #2211 from dgoodwin/33-upgrade-playbookScott Dodson2016-08-0838-85/+308
|\ \ \
| * | | Migrate ca.crt to ca-bundle.crtScott Dodson2016-08-081-0/+25
| * | | Upgrade configs for protobuf support.Devan Goodwin2016-08-084-0/+68
| * | | Fixed a bug in modify_yaml module.Devan Goodwin2016-08-082-11/+56
| * | | Add 3.3 protobuf config stanzas for master/node config.Devan Goodwin2016-07-282-0/+21
| * | | Introduce 1.3/3.3 upgrade path.Devan Goodwin2016-07-2532-74/+138
* | | | Merge pull request #2267 from Jmainguy/build_md_liesScott Dodson2016-08-081-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | BUILD.md liesJonathan Mainguy2016-08-081-2/+2
|/ / /
* | | Merge pull request #2266 from abutcher/v2-callbacksAndrew Butcher2016-08-083-25/+31
|\ \ \ | |_|/ |/| |
| * | Convert ansible facts callback to v2.Andrew Butcher2016-08-083-25/+31
* | | Automatic commit of package [openshift-ansible] release [3.3.8-1].Troy Dawson2016-08-082-2/+6
* | | Merge pull request #2265 from jmferrer/masterScott Dodson2016-08-083-3/+3
|\ \ \ | |/ / |/| |
| * | Fix little mistake in openshift_master_htpasswd_users value .jmferrer2016-08-083-3/+3
|/ /
* | Automatic commit of package [openshift-ansible] release [3.3.7-1].Troy Dawson2016-08-052-2/+16
* | Merge pull request #2260 from abutcher/new-master-lbScott Dodson2016-08-051-0/+2
|\ \
| * | Call relocated openshift-loadbalancer playbook in master scaleup.Andrew Butcher2016-08-041-0/+2
* | | Merge pull request #2259 from abutcher/fix-ca-checkScott Dodson2016-08-051-2/+1
|\ \ \
| * | | [openshift_ca] correct check for missing CA.Andrew Butcher2016-08-041-2/+1
| |/ /
* | | Merge pull request #2257 from smunilla/ose_rename_to_oscpScott Dodson2016-08-041-1/+1
|\ \ \ | |/ / |/| |