diff options
author | Scott Dodson <sdodson@redhat.com> | 2018-01-05 16:19:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 16:19:23 -0500 |
commit | 31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch) | |
tree | 1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | |
parent | caec381b6cd0ea632cfe927c23b6229ab69e834a (diff) | |
parent | eacc12897ca86a255f89b8a4537ce2b7004cf319 (diff) | |
download | openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.gz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.bz2 openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.xz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.zip |
Merge pull request #6627 from sdodson/import_role
Migrate to import_role for static role inclusion
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 0263e721d..91d496ff4 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -50,7 +50,7 @@ openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" serial: 1 tasks: - - include_role: + - import_role: name: openshift_facts # Run the pre-upgrade hook if defined: @@ -60,7 +60,7 @@ - include_tasks: "{{ openshift_master_upgrade_pre_hook }}" when: openshift_master_upgrade_pre_hook is defined - - include_role: + - import_role: name: openshift_master tasks_from: upgrade.yml @@ -301,7 +301,7 @@ roles: - openshift_facts post_tasks: - - include_role: + - import_role: name: openshift_node tasks_from: upgrade.yml vars: |