openstack/tripleo-common
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-06-27 22:28:49 +00:00 committed by Gerrit Code Review
commit a30bb5bca2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/actions/ansible.py
View File

@ -21,7 +21,6 @@ import tempfile
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 @@ class AnsibleAction(actions.Action):
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 @@ class AnsiblePlaybookAction(actions.Action):
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)