From 98a0fb2405c3b8b911d384c977a196f352da2843 Mon Sep 17 00:00:00 2001
From: Jordan Pittier <jordan.pittier@gmail.com>
Date: Tue, 12 Mar 2019 17:43:59 +0100
Subject: [PATCH] Update default cirros version

Following I419348f1784600e3989c8e86a99c04b24f3610c4

Change-Id: I0661144bb6f6d26b3026b011a7fbb01f1998279a
---
 tools/func-tests.sh | 4 ++--
 tools/populate.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/func-tests.sh b/tools/func-tests.sh
index cd9480b..0c04600 100755
--- a/tools/func-tests.sh
+++ b/tools/func-tests.sh
@@ -79,7 +79,7 @@ function assert_volume {
 ########################
 source $DEVSTACK_DIR/openrc admin admin
 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
 
 
@@ -171,4 +171,4 @@ fi
 if [[ $(openstack zone list --all-projects | wc -l) -ne 1 ]]; then  # This also checks FIP
     echo "Not all zones were cleaned up"
     exit 1
-fi
\ No newline at end of file
+fi
diff --git a/tools/populate.sh b/tools/populate.sh
index 02781fb..25bbc3e 100755
--- a/tools/populate.sh
+++ b/tools/populate.sh
@@ -67,7 +67,7 @@ EXTNET_NAME=${EXTNET_NAME:-public}
 # Name of flavor used to spawn a VM
 FLAVOR=${FLAVOR:-m1.nano}
 # 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="${UUID//-/}.com."