diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-09 09:42:31 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-09 10:30:33 -0500 |
| commit | b95953299e96e0e1bcd20ea02627fa14b8b0fc6f (patch) | |
| tree | 9d07c3dd9051b802a1161873809fdc77e730717f | |
| parent | b144534935e3bcfadd7af34fa0eb18f4cbac8d8b (diff) | |
| download | openshift-b95953299e96e0e1bcd20ea02627fa14b8b0fc6f.tar.gz openshift-b95953299e96e0e1bcd20ea02627fa14b8b0fc6f.tar.bz2 openshift-b95953299e96e0e1bcd20ea02627fa14b8b0fc6f.tar.xz openshift-b95953299e96e0e1bcd20ea02627fa14b8b0fc6f.zip | |
Ensure that openshift_facts role is imported whenever we rely on
openshift_client_binary
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 372a39e74..21352b8d2 100644 --- a/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml +++ b/playbooks/common/openshift-cluster/upgrades/create_service_signer_cert.yml @@ -13,6 +13,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 50be0dee0..3fb028a16 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 @@ -128,6 +129,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 |