diff options
| author |   mbeierl <mark.beierl@dell.com> | 2018-06-28 11:13:34 -0400 |
|---|---|---|
| committer | Mark Beierl <mark.beierl@dell.com> | 2018-06-28 16:32:49 +0000 |
| commit | b9bcdaaf946279c7e119caecf7eee9f87f449361 (patch) | |
| tree | 0f6c0521c020e19ebf238f42deb69c84cbd301f0 | |
| parent | cd0cefd880688bd3b31e355d893a46e4713a5608 (diff) | |
Fixes daily run
Change-Id: I8f17efe0d0866a3dc6ecbbabe07985b93ac445e6
Signed-off-by: mbeierl <mark.beierl@dell.com>
(cherry picked from commit 3c14f6cf6344c4a83aa7c4f586db39bb69a5d93e)
| -rwxr-xr-x | ci/create_storperf_flavor.sh | 2 | ||||
| -rwxr-xr-x | ci/daily.sh | 1 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/storperf_master.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/ci/create_storperf_flavor.sh b/ci/create_storperf_flavor.sh index f25d56d..4f751f4 100755 --- a/ci/create_storperf_flavor.sh +++ b/ci/create_storperf_flavor.sh @@ -10,8 +10,6 @@ echo "Checking for StorPerf flavor" -openstack flavor delete storperf - FLAVOUR=`openstack flavor list | grep "storperf"` if [ -z "$FLAVOUR" ] then diff --git a/ci/daily.sh b/ci/daily.sh index 956b6e6..ada8cfd 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -36,6 +36,7 @@ pip install functools32==3.2.3.post2 pip install pytz==2016.10 pip install osc_lib==1.3.0 pip install python-openstackclient==3.7.0 +pip install python-heatclient==1.16.0 "${WORKSPACE}/ci/generate-admin-rc.sh" diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index 044cbb2..69ff57d 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -296,7 +296,7 @@ class StorPerfMaster(object): 'storperf/resources/hot/storperf-volume.yaml'] self.stack_settings.env_values = self._make_parameters() try: - self.heat_stack.create() + self.heat_stack.create(block=True) except Exception as e: self.logger.error("Stack creation failed") self.logger.exception(e) |