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/openshift-node/private | |
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/openshift-node/private')
-rw-r--r-- | playbooks/openshift-node/private/additional_config.yml | 2 | ||||
-rw-r--r-- | playbooks/openshift-node/private/image_prep.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-node/private/additional_config.yml b/playbooks/openshift-node/private/additional_config.yml index b86cb3cc2..54ed1927d 100644 --- a/playbooks/openshift-node/private/additional_config.yml +++ b/playbooks/openshift-node/private/additional_config.yml @@ -57,7 +57,7 @@ - name: Configure Kuryr node hosts: oo_nodes_use_kuryr tasks: - - include_role: + - import_role: name: kuryr tasks_from: node when: openshift_use_kuryr | default(false) | bool diff --git a/playbooks/openshift-node/private/image_prep.yml b/playbooks/openshift-node/private/image_prep.yml index c0ddcd926..adcbb0fdb 100644 --- a/playbooks/openshift-node/private/image_prep.yml +++ b/playbooks/openshift-node/private/image_prep.yml @@ -15,7 +15,7 @@ - name: node bootstrap config hosts: oo_nodes_to_config:!oo_containerized_master_nodes tasks: - - include_role: + - import_role: name: openshift_node tasks_from: bootstrap.yml |