summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-08 16:26:22 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-08 16:29:27 -0500
commit63e02d4bd0b6c00bb792c39210b4433b0dae9f17 (patch)
treec1de5739b0bbd5d93fd8edfb4c9d7f711de40302
parent74294d8258a4812752434feaf4cd4b512a992af8 (diff)
downloadopenshift-63e02d4bd0b6c00bb792c39210b4433b0dae9f17.tar.gz
openshift-63e02d4bd0b6c00bb792c39210b4433b0dae9f17.tar.bz2
openshift-63e02d4bd0b6c00bb792c39210b4433b0dae9f17.tar.xz
openshift-63e02d4bd0b6c00bb792c39210b4433b0dae9f17.zip
Fix: change import_role to include_role
It appears that when one role dynamically imports another, usage of import_role inside the dynamically included role is not possible. If something is included with include_role (dynamic), all tasks therein must also use include_role (dynamic).
-rw-r--r--roles/openshift_logging_elasticsearch/tasks/main.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml
index 9bd37f33c..bf3b743af 100644
--- a/roles/openshift_logging_elasticsearch/tasks/main.yaml
+++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml
@@ -181,7 +181,9 @@
changed_when: no
# create diff between current configmap files and our current files
-- import_role:
+# NOTE: include_role must be used instead of import_role because
+# this task file is looped over from another role.
+- include_role:
name: openshift_logging
tasks_from: patch_configmap_files.yaml
vars: