x/ospurge
Code Issues Proposed changes

Update default cirros version

Browse Source 
Following I419348f1784600e3989c8e86a99c04b24f3610c4

Change-Id: I0661144bb6f6d26b3026b011a7fbb01f1998279a
This commit is contained in:
Jordan Pittier 2019-03-12 17:43:59 +01:00 committed by JordanP
parent f9b785cfaf
commit 98a0fb2405
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/func-tests.sh
View File

@ -79,7 +79,7 @@ function assert_volume {
######################## ########################
source $DEVSTACK_DIR/openrc admin admin source $DEVSTACK_DIR/openrc admin admin
if [[ ! "$(openstack flavor list)" =~ 'm1.nano' ]]; then if [[ ! "$(openstack flavor list)" =~ 'm1.nano' ]]; then
openstack flavor create --id 42 --ram 64 --disk 0 --vcpus 1 m1.nano openstack flavor create --id 42 --ram 64 --disk 1 --vcpus 1 m1.nano
fi fi
@ -171,4 +171,4 @@ fi
if [[ $(openstack zone list --all-projects | wc -l) -ne 1 ]]; then # This also checks FIP if [[ $(openstack zone list --all-projects | wc -l) -ne 1 ]]; then # This also checks FIP
echo "Not all zones were cleaned up" echo "Not all zones were cleaned up"
exit 1 exit 1
fi fi

2
tools/populate.sh
View File

@ -67,7 +67,7 @@ EXTNET_NAME=${EXTNET_NAME:-public}
# Name of flavor used to spawn a VM # Name of flavor used to spawn a VM
FLAVOR=${FLAVOR:-m1.nano} FLAVOR=${FLAVOR:-m1.nano}
# Image used for the VM # Image used for the VM
VMIMG_NAME=${VMIMG_NAME:-cirros-0.3.5-x86_64-disk} VMIMG_NAME=${VMIMG_NAME:-cirros-0.4.0-x86_64-disk}
# Zone name used for the Designate Zone # Zone name used for the Designate Zone
ZONE_NAME="${UUID//-/}.com." ZONE_NAME="${UUID//-/}.com."