diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-10 20:15:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 20:15:32 -0500 |
| commit | e45ef801051202f9d79a0dc814d4a3e056b257d2 (patch) | |
| tree | 7a7057831dc91ec3683115e99605fcf647f65a12 | |
| parent | 1bede283af9ab2e057942b65c946c548bcd212a2 (diff) | |
| parent | b95953299e96e0e1bcd20ea02627fa14b8b0fc6f (diff) | |
| download | openshift-e45ef801051202f9d79a0dc814d4a3e056b257d2.tar.gz openshift-e45ef801051202f9d79a0dc814d4a3e056b257d2.tar.bz2 openshift-e45ef801051202f9d79a0dc814d4a3e056b257d2.tar.xz openshift-e45ef801051202f9d79a0dc814d4a3e056b257d2.zip | |
Merge pull request #6666 from sdodson/fix_client_binary
Ensure that openshift_facts role is imported whenever we rely on
3 files changed, 8 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml b/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml index ef8233b67..6d82fa928 100644 --- a/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml +++ b/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml @@ -17,6 +17,8 @@ - name: Create service signer certificate hosts: oo_first_master + roles: + - openshift_facts tasks: - name: Create remote temp directory for creating certs command: mktemp -d /tmp/openshift-ansible-XXXXXXX diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 412075d41..ecb7c360c 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -22,6 +22,8 @@ # See: https://github.com/openshift/origin/pull/14625#issuecomment-308467060 - name: Pre master upgrade - Upgrade all storage hosts: oo_first_master + roles: + - openshift_facts tasks: - name: Upgrade all storage command: > @@ -49,10 +51,9 @@ vars: openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" serial: 1 + roles: + - openshift_facts tasks: - - import_role: - name: openshift_facts - # Run the pre-upgrade hook if defined: - debug: msg="Running master pre-upgrade hook {{ openshift_master_upgrade_pre_hook }}" when: openshift_master_upgrade_pre_hook is defined @@ -127,6 +128,7 @@ hosts: oo_masters_to_config roles: - { role: openshift_cli } + - { role: openshift_facts } vars: __master_shared_resource_viewer_file: "shared_resource_viewer_role.yaml" tasks: diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml index 49e691352..9c7688981 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml @@ -7,6 +7,7 @@ hosts: oo_first_master roles: - { role: lib_openshift } + - { role: openshift_facts } tasks: - name: Check for invalid namespaces and SDN errors |