Merge "Switch the ansible actions over to mistral-lib"

openstack-archive · Jun 27, 2017 · a30bb5b · a30bb5b
2 parents 8e70861 + 160f795
commit a30bb5b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py
@@ -21,7 +21,6 @@
 
 import yaml
 
-from mistral.workflow import utils as mistral_workflow_utils
 from mistral_lib import actions
 from oslo_concurrency import processutils
 
@@ -185,7 +184,7 @@ def run(self, context):
         if self.extra_env_variables:
             if not isinstance(self.extra_env_variables, dict):
                 msg = "extra_env_variables must be a dict"
-                return mistral_workflow_utils.Result(error=msg)
+                return actions.Result(error=msg)
 
         try:
             ansible_config_path = write_default_ansible_cfg(self.work_dir)
@@ -385,7 +384,7 @@ def run(self, context):
         if self.extra_env_variables:
             if not isinstance(self.extra_env_variables, dict):
                 msg = "extra_env_variables must be a dict"
-                return mistral_workflow_utils.Result(error=msg)
+                return actions.Result(error=msg)
 
         try:
             ansible_config_path = write_default_ansible_cfg(self.work_dir)