summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@dell.com>2017-07-13 19:19:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-13 19:19:43 +0000
commit01533363863239f00411943e9e83ac27ec0cbff5 (patch)
treebb28f0ecf4c54b75451b927449cfcfcc07acab79
parent8ebe4db7368b971c0069c54ff8b89134a8124a34 (diff)
parent6cff5d9e9680a8f98efd0b85841b682c4c4cdb86 (diff)
Merge "Add reason for stack creation failure"
-rw-r--r--docker/storperf-master/rest_server.py2
-rw-r--r--docker/storperf-master/storperf/storperf_master.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/storperf-master/rest_server.py b/docker/storperf-master/rest_server.py
index cc8d834..ef8975c 100644
--- a/docker/storperf-master/rest_server.py
+++ b/docker/storperf-master/rest_server.py
@@ -105,7 +105,7 @@ class Configure(Resource):
storperf.create_stack()
if storperf.stack_id is None:
- abort(400, "Stack creation failed")
+ abort(400, storperf.status_reason)
return jsonify({'agent_count': storperf.agent_count,
'agent_flavor': storperf.agent_flavor,
diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py
index fb3e269..054d2a7 100644
--- a/docker/storperf-master/storperf/storperf_master.py
+++ b/docker/storperf-master/storperf/storperf_master.py
@@ -273,6 +273,7 @@ class StorPerfMaster(object):
self.stack_id = None
return True
if (status == u'CREATE_FAILED'):
+ self.status_reason = getattr(stack, 'stack_status_reason')
sleep(5)
self._heat_client.stacks.delete(stack_id=self.stack_id)
sleep(2)