summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-master/private/config.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-05 16:19:23 -0500
committerGitHub <noreply@github.com>2018-01-05 16:19:23 -0500
commit31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch)
tree1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /playbooks/openshift-master/private/config.yml
parentcaec381b6cd0ea632cfe927c23b6229ab69e834a (diff)
parenteacc12897ca86a255f89b8a4537ce2b7004cf319 (diff)
downloadopenshift-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-master/private/config.yml')
-rw-r--r--playbooks/openshift-master/private/config.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml
index e53a6f093..4752ba78e 100644
--- a/playbooks/openshift-master/private/config.yml
+++ b/playbooks/openshift-master/private/config.yml
@@ -206,13 +206,13 @@
- role: calico_master
when: openshift_use_calico | default(false) | bool
tasks:
- - include_role:
+ - import_role:
name: kuryr
tasks_from: master
when: openshift_use_kuryr | default(false) | bool
- name: Setup the node group config maps
- include_role:
+ import_role:
name: openshift_node_group
when: openshift_master_bootstrap_enabled | default(false) | bool
run_once: True