backport of aggregates compatibility fix
this is the aggregates compatibility fix for stable/grizzly (coming from master). This should let stable/grizzly exercises pass which will let us do grenade runs on stable/havana. Change-Id: Iaa0cf13a287a206442c611b4f2805c2fb0c90e9f
This commit is contained in:
parent
ee29648991
commit
d5b2e49981
|
@ -98,7 +98,7 @@ META_DATA_2_KEY=foo
|
|||
META_DATA_3_KEY=bar
|
||||
|
||||
#ensure no additional metadata is set
|
||||
nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
||||
nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|"
|
||||
|
||||
nova aggregate-set-metadata $AGGREGATE_ID ${META_DATA_1_KEY}=123
|
||||
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_1_KEY
|
||||
|
@ -115,7 +115,7 @@ nova aggregate-details $AGGREGATE_ID | grep $META_DATA_3_KEY
|
|||
nova aggregate-details $AGGREGATE_ID | grep $META_DATA_2_KEY && die $LINENO "ERROR metadata was not cleared"
|
||||
|
||||
nova aggregate-set-metadata $AGGREGATE_ID $META_DATA_3_KEY $META_DATA_1_KEY
|
||||
nova aggregate-details $AGGREGATE_ID | egrep "{u'availability_zone': u'$AGGREGATE_A_ZONE'}|{}"
|
||||
nova aggregate-details $AGGREGATE_ID | egrep "\|[{u ]*'availability_zone.+$AGGREGATE_A_ZONE'[ }]*\|"
|
||||
|
||||
|
||||
# Test aggregate-add/remove-host
|
||||
|
|
Loading…
Reference in New Issue