summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6315 from riffraff169/contiv-multimasterRussell Teague2017-12-134-3/+29
|\
| * Multimaster openshift+contiv fixesLance Dillon2017-11-294-3/+29
* | Merge pull request #6179 from alexcern/update_is_python_36Russell Teague2017-12-1321-27/+78
|\ \
| * | Sync latest image-streams and templatesAlex Lossent2017-11-2021-27/+78
* | | Merge pull request #5839 from jmencak/prometheus-storage_classScott Dodson2017-12-134-0/+14
|\ \ \
| * | | Add support for storage classes to openshift_prometheus role.Jiri Mencak2017-12-124-0/+14
* | | | Merge pull request #6453 from sdodson/fix-versioned-installScott Dodson2017-12-131-1/+1
|\ \ \ \
| * | | | Ensure that clients are version boundScott Dodson2017-12-121-1/+1
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.8.0].Jenkins CD Merge Bot2017-12-122-2/+6
* | | | | Merge pull request #6451 from mgugino-upstream-stage/remove-empty-hosted-factsScott Dodson2017-12-128-25/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove empty openshift_hosted_facts roleMichael Gugino2017-12-128-25/+6
* | | | | Merge pull request #6407 from mgugino-upstream-stage/crt-upgradesScott Dodson2017-12-1229-1357/+406
|\ \ \ \ \
| * | | | | Refactor upgrade codepaths step 1Michael Gugino2017-12-1229-1357/+406
| |/ / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.7.0].Jenkins CD Merge Bot2017-12-122-2/+8
* | | | | Merge pull request #6445 from mtnbikenc/fix-openshift-examplesScott Dodson2017-12-123-2/+1
|\ \ \ \ \
| * | | | | Remove bad openshift_examples symlinkRussell Teague2017-12-123-2/+1
* | | | | | Merge pull request #6432 from sdodson/require-24Russell Teague2017-12-122-2/+2
|\ \ \ \ \ \
| * | | | | | Bump RPM version requirementScott Dodson2017-12-112-2/+2
* | | | | | | Merge pull request #6408 from mgugino-upstream-stage/update-readmeScott Dodson2017-12-121-7/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Clarify version selection in READMEMichael Gugino2017-12-081-7/+14
* | | | | | | Merge pull request #6335 from kwoodson/node_groups_refactorScott Dodson2017-12-1223-184/+262
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Changing the node group format to a list.Kenny Woodson2017-12-1123-184/+262
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.6.0].Jenkins CD Merge Bot2017-12-122-2/+6
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #6381 from bogdando/dns_hostname_prefixesOpenShift Merge Robot2017-12-123-7/+21
|\ \ \ \ \ \
| * | | | | | Allow 2 sets of hostnames for openstack providerBogdan Dobrelya2017-12-113-7/+21
* | | | | | | Merge pull request #6433 from joelddiaz/example-inventory-master-portOpenShift Merge Robot2017-12-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | add openshift_master_api_port var to example inventoryJoel Diaz2017-12-111-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.5.0].Jenkins CD Merge Bot2017-12-112-2/+5
* | | | | | | Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcdOpenShift Merge Robot2017-12-1111-51/+7
|\ \ \ \ \ \ \
| * | | | | | | Remove unneeded embedded etcd logicMichael Gugino2017-12-0811-51/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.4.0].Jenkins CD Merge Bot2017-12-112-2/+6
* | | | | | | Merge pull request #6418 from sdodson/bz1424102OpenShift Merge Robot2017-12-113-0/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add missing dependencies on openshift_facts roleScott Dodson2017-12-103-0/+3
* | | | | | | Merge pull request #6393 from kwoodson/ansible_2.4_sg_fixScott Dodson2017-12-112-2/+905
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Copying upstream fix for ansible 2.4 ec2_group module.Kenny Woodson2017-12-112-2/+905
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.3.0].Jenkins CD Merge Bot2017-12-112-2/+9
* | | | | | | Merge pull request #6427 from sosiouxme/20171211-excise-integration-testsLuke Meyer2017-12-113-3/+0
|\ \ \ \ \ \ \
| * | | | | | | remove integration tests from toxLuke Meyer2017-12-113-3/+0
* | | | | | | | Merge pull request #6402 from jmencak/cns-glusterfs_wipeScott Dodson2017-12-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Check for openshift attribute before using it during CNS install.Jiri Mencak2017-12-081-1/+1
* | | | | | | | | Merge pull request #6425 from joelddiaz/aws-readmeOpenShift Merge Robot2017-12-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | correct ansible-playbook command syntaxJoel Diaz2017-12-111-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6416 from mgugino-upstream-stage/upgrades-service-typeOpenShift Merge Robot2017-12-117-0/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add openshift_facts to upgrade plays for service_typeMichael Gugino2017-12-097-0/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.2.0].Jenkins CD Merge Bot2017-12-112-2/+7
* | | | | | | | Merge pull request #6421 from mtnbikenc/fix-hosted-registryScott Dodson2017-12-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix openshift hosted registry rolloutRussell Teague2017-12-111-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #6422 from jarrpa/glusterfs-docScott Dodson2017-12-111-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | GlusterFS: Add playbook doc noteJose A. Rivera2017-12-111-0/+3
|/ / / / / / /
* | | | | | | Merge pull request #6406 from sdodson/remove-cr-depOpenShift Merge Robot2017-12-101-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |