summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 20:06:03 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 20:06:03 +0000
commitea072718ed9331ee1c758d3b5b141d59477ddb0e (patch)
treee1bed642dfb9511ecf7badfaf71c037a27341265
parentef72ac56633feff8bc6ab1320e4b8d332363505a (diff)
parent082ec2a9eda61a26f4b0818d00941dbd99277188 (diff)
Merge "remove workaround in grenade"
-rwxr-xr-xdevstack/upgrade/resources.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index ba83d9d..9f767b7 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -179,11 +179,6 @@ function create {
179 create_cluster 179 create_cluster
180 180
181 wait_active_state 181 wait_active_state
182
183 # delete cluster
184 check_active
185
186 openstack dataprocessing cluster delete $CLUSTER_NAME --wait
187} 182}
188 183
189function verify { 184function verify {
@@ -199,8 +194,9 @@ function destroy {
199 set +o errexit 194 set +o errexit
200 195
201 # delete cluster 196 # delete cluster
202 # check_active 197 check_active
203 # openstack dataprocessing cluster delete $CLUSTER_NAME --wait 198
199 openstack dataprocessing cluster delete $CLUSTER_NAME --wait
204 200
205 set -o errexit 201 set -o errexit
206 202