summaryrefslogtreecommitdiffstats
path: root/roles/lib_utils/callback_plugins/openshift_quick_installer.py
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 /roles/lib_utils/callback_plugins/openshift_quick_installer.py
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 'roles/lib_utils/callback_plugins/openshift_quick_installer.py')
-rw-r--r--roles/lib_utils/callback_plugins/openshift_quick_installer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_utils/callback_plugins/openshift_quick_installer.py b/roles/lib_utils/callback_plugins/openshift_quick_installer.py
index c0fdbc650..365e2443d 100644
--- a/roles/lib_utils/callback_plugins/openshift_quick_installer.py
+++ b/roles/lib_utils/callback_plugins/openshift_quick_installer.py
@@ -192,7 +192,7 @@ The only thing we change here is adding `log_only=True` to the
"""
delegated_vars = result._result.get('_ansible_delegated_vars', None)
self._clean_results(result._result, result._task.action)
- if result._task.action in ('include', 'include_role'):
+ if result._task.action in ('include', 'import_role'):
return
elif result._result.get('changed', False):
if delegated_vars:
@@ -220,7 +220,7 @@ The only thing we change here is adding `log_only=True` to the
def v2_runner_item_on_ok(self, result):
"""Print out task results for items you're iterating over"""
delegated_vars = result._result.get('_ansible_delegated_vars', None)
- if result._task.action in ('include', 'include_role'):
+ if result._task.action in ('include', 'import_role'):
return
elif result._result.get('changed', False):
msg = 'changed'