Merge "Add support of OSSysLogHandler logging handler"
diff --git a/_states/keystoneng.py b/_states/keystoneng.py
index 060ccfb..dcefbd9 100644
--- a/_states/keystoneng.py
+++ b/_states/keystoneng.py
@@ -67,6 +67,8 @@
'''
+# Import 3rd-party libs
+from salt.ext import six
def __virtual__():
'''
@@ -392,9 +394,17 @@
else:
created = __salt__['keystoneng.tenant_create'](name=name, description=description, enabled=enabled,
profile=profile, **connection_args)
- ret['changes']['Tenant'] = 'Created' if created is True else 'Failed'
- ret['result'] = created
- ret['comment'] = 'Tenant / project "{0}" has been added'.format(name)
+ # If tenant has been created succesfully 'created' is:
+ # {u'test_tenant3': {'enabled': True, 'NAME_ATTR': 'name', 'HUMAN_ID': False, 'name': u'test_tenant3', 'id': u'0a5f319f8a794bfc9045746069c76fd8'}}
+ # If tenant is not created:
+ # {'Error': 'Unable to resolve tenant id'}
+ if 'Error' in created and isinstance(created['Error'], six.string_types):
+ ret['result'] = False
+ ret['comment'] = 'Cannot create tenant / project "{0}"'.format(name)
+ else:
+ ret['changes']['Tenant'] = 'Created'
+ ret['result'] = True
+ ret['comment'] = 'Tenant / project "{0}" has been added'.format(name)
return ret
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9a4e8ea..af5ccb3 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -37,7 +37,7 @@
log_info "Setting up Python virtualenv"
virtualenv $VENV_DIR
source ${VENV_DIR}/bin/activate
- pip install salt${PIP_SALT_VERSION}
+ python -m pip install salt${PIP_SALT_VERSION}
}
setup_pillar() {
@@ -114,7 +114,7 @@
salt_run() {
[ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
- salt-call ${SALT_OPTS} $*
+ python $(which salt-call) ${SALT_OPTS} $*
}
prepare() {