summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6315 from riffraff169/contiv-multimasterRussell Teague2017-12-134-3/+29
|\ | | | | Multimaster openshift+contiv fixes
| * Multimaster openshift+contiv fixesLance Dillon2017-11-294-3/+29
| | | | | | | | | | | | | | Only run default contiv commands once Fix detection of firewalld Open up netmaster ports to all nodes Make sure etcd ca stuff only runs once
* | Merge pull request #6179 from alexcern/update_is_python_36Russell Teague2017-12-1321-27/+78
|\ \ | | | | | | Sync latest image-streams and templates
| * | Sync latest image-streams and templatesAlex Lossent2017-11-2021-27/+78
| | | | | | | | | | | | Following openshift/origin#17281
* | | Merge pull request #5839 from jmencak/prometheus-storage_classScott Dodson2017-12-134-0/+14
|\ \ \ | | | | | | | | Add support for storage classes to openshift_prometheus role.
| * | | 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 bound
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6451 from mgugino-upstream-stage/remove-empty-hosted-factsScott Dodson2017-12-128-25/+6
|\ \ \ \ \ | |/ / / / |/| | | | Remove empty openshift_hosted_facts role
| * | | | Remove empty openshift_hosted_facts roleMichael Gugino2017-12-128-25/+6
| | | | | | | | | | | | | | | | | | | | This commit removes a now-empty role.
* | | | | Merge pull request #6407 from mgugino-upstream-stage/crt-upgradesScott Dodson2017-12-1229-1357/+406
|\ \ \ \ \ | | | | | | | | | | | | Refactor upgrade codepaths step 1
| * | | | | Refactor upgrade codepaths step 1Michael Gugino2017-12-1229-1357/+406
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit refactors some upgrade code paths. Touched areas are: 1) Reduces usage of 'oo_all_hosts' in various places, especially when running upgrade_control_plane. 2) Reuses common code across the various upgrade* playbooks. 3) Moves docker upgrade checks into container_runtime_role. 4) Combines smaller playbooks and plays to reduce file sprawl.
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.7.0].Jenkins CD Merge Bot2017-12-122-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6445 from mtnbikenc/fix-openshift-examplesScott Dodson2017-12-123-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove bad openshift_examples symlink
| * | | | | Remove bad openshift_examples symlinkRussell Teague2017-12-123-2/+1
| | | | | |
* | | | | | Merge pull request #6432 from sdodson/require-24Russell Teague2017-12-122-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump ansible RPM version req to 2.4.1
| * | | | | | 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 README
| * | | | | | Clarify version selection in READMEMichael Gugino2017-12-081-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit helps usher users into selecting the correct release for them.
* | | | | | | Merge pull request #6335 from kwoodson/node_groups_refactorScott Dodson2017-12-1223-184/+262
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Node group management update.
| * | | | | | 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
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #6381 from bogdando/dns_hostname_prefixesOpenShift Merge Robot2017-12-123-7/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow 2 sets of hostnames for openstack provider Support private/public hostnames suffixes for DNS records. Real hostnames, Inventory variables, Nova servers and ansible hostnames will ignore the custom suffixes. Those are only for nsupdates sent to external DNS servers. Related change: add openshift_openstack_public_dns_domain to the role defaults to not rely on the group vars example only. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com> Co-authored-by: Tomas Sedovic <tsedovic@redhat.com>
| * | | | | | Allow 2 sets of hostnames for openstack providerBogdan Dobrelya2017-12-113-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support private/public hostnames suffixes for DNS records. Real hostnames, Inventory variables, Nova servers and ansible hostnames will ignore the custom suffixes. Those are only for nsupdates sent to external DNS servers. Related change: add openshift_openstack_public_dns_domain to the role defaults to not rely on the group vars example only. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com> Co-authored-by: Tomas Sedovic <tsedovic@redhat.com>
* | | | | | | Merge pull request #6433 from joelddiaz/example-inventory-master-portOpenShift Merge Robot2017-12-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add openshift_master_api_port var to example inventory
| * | | | | | | add openshift_master_api_port var to example inventoryJoel Diaz2017-12-111-0/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | would get timeouts during master node installation without this setting
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.5.0].Jenkins CD Merge Bot2017-12-112-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcdOpenShift Merge Robot2017-12-1111-51/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unneeded embedded etcd logic Removing some remaining embedded etcd facts except for the migration plays.
| * | | | | | | Remove unneeded embedded etcd logicMichael Gugino2017-12-0811-51/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Removing some remaining embedded etcd facts except for the migration plays.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.4.0].Jenkins CD Merge Bot2017-12-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6418 from sdodson/bz1424102OpenShift Merge Robot2017-12-113-0/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add missing dependencies on openshift_facts role All of these roles call the openshift_facts module but didn't include the role in their dependencies which can lead to errors in Ansible 2.4. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1524102
| * | | | | | Add missing dependencies on openshift_facts roleScott Dodson2017-12-103-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of these roles call the openshift_facts module but didn't include the role in their dependencies which can lead to errors in Ansible 2.4. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1524102
* | | | | | | 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.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6427 from sosiouxme/20171211-excise-integration-testsLuke Meyer2017-12-113-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | These don't affect anything but tox and travis tests. Since those are passing, going to just merge this.
| * | | | | | | 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.
| * | | | | | | | Check for openshift attribute before using it during CNS install.Jiri Mencak2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: BZ1523681
* | | | | | | | | Merge pull request #6425 from joelddiaz/aws-readmeOpenShift Merge Robot2017-12-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. correct ansible-playbook command syntax
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add openshift_facts to upgrade plays for service_type Bring openshift_facts into scope for plays that utilize openshift_service_type as it is defined there.
| * | | | | | | | Add openshift_facts to upgrade plays for service_typeMichael Gugino2017-12-097-0/+13
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring openshift_facts into scope for plays that utilize openshift_service_type as it is defined there.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.2.0].Jenkins CD Merge Bot2017-12-112-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6421 from mtnbikenc/fix-hosted-registryScott Dodson2017-12-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix openshift hosted registry rollout
| * | | | | | | | 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 note
| * | | | | | | GlusterFS: Add playbook doc noteJose A. Rivera2017-12-111-0/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | Merge pull request #6406 from sdodson/remove-cr-depOpenShift Merge Robot2017-12-101-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove container_runtime from the openshift_version We meant to remove this before merging #6316