summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-08 19:53:53 -0500
committerGitHub <noreply@github.com>2018-01-08 19:53:53 -0500
commitb144534935e3bcfadd7af34fa0eb18f4cbac8d8b (patch)
tree0edd1e42ae4fee3b10164d643f2be912f2f50ce1 /roles
parent7536af8e199c025451bdb7f5083c685b8ed5180d (diff)
parent63e02d4bd0b6c00bb792c39210b4433b0dae9f17 (diff)
downloadopenshift-b144534935e3bcfadd7af34fa0eb18f4cbac8d8b.tar.gz
openshift-b144534935e3bcfadd7af34fa0eb18f4cbac8d8b.tar.bz2
openshift-b144534935e3bcfadd7af34fa0eb18f4cbac8d8b.tar.xz
openshift-b144534935e3bcfadd7af34fa0eb18f4cbac8d8b.zip
Merge pull request #6660 from mgugino-upstream-stage/fix-logging-static
Fix: change import_role to include_role
Diffstat (limited to 'roles')
-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: