Move image setup to tacker-setup.sh

JIRA: MODELS-23

Change-Id: I3b6aaf692670046820b39aad82df423b8d051eb3
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

diff --git a/tests/utils/tacker-setup.sh b/tests/utils/tacker-setup.sh
index c05b18c..6293615 100644 (file)
--- a/tests/utils/tacker-setup.sh
+++ b/tests/utils/tacker-setup.sh
@@ -168,6 +168,10 @@ function setup () {
   echo "$0: $(date) Setup admin-openrc.sh"
   source /opt/tacker/admin-openrc.sh
 
+  echo "$0: $(date) Create image models-xenial-server"
+  image_id=$(openstack image list | awk "/ models-xenial-server / { print \$2 }")
+  if [[ -z "$image_id" ]]; then glance --os-image-api-version 1 image-create --name models-xenial-server --disk-format qcow2 --location http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img --container-format bare; fi
+
   uid=$(openstack user list | awk "/ tacker / { print \$2 }")
   if [[ $uid ]]; then
     echo "$0: $(date) Remove prior Tacker user etc"

diff --git a/tests/vHello_3Node_Tacker.sh b/tests/vHello_3Node_Tacker.sh
index ece5bba..b78440e 100644 (file)
--- a/tests/vHello_3Node_Tacker.sh
+++ b/tests/vHello_3Node_Tacker.sh
@@ -150,10 +150,6 @@ setup () {
   source /opt/tacker/admin-openrc.sh
   chmod 755 /opt/tacker/*.sh
 
-  echo "$0: $(date) Create image models-xenial-server"
-  image_id=$(openstack image list | awk "/ models-xenial-server / { print \$2 }")
-  if [[ -z "$image_id" ]]; then glance --os-image-api-version 1 image-create --name models-xenial-server --disk-format qcow2 --location http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img --container-format bare; fi
-
   echo "$0: $(date) tacker-setup part 1"
   bash utils/tacker-setup.sh init
   if [ $? -eq 1 ]; then fail; fi

diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh
index f7a89d0..ac57b7a 100644 (file)
--- a/tests/vHello_Tacker.sh
+++ b/tests/vHello_Tacker.sh
@@ -149,10 +149,6 @@ setup () {
   source /opt/tacker/admin-openrc.sh
   chmod 755 /opt/tacker/*.sh
 
-  echo "$0: $(date) Create image models-xenial-server"
-  image_id=$(openstack image list | awk "/ models-xenial-server / { print \$2 }")
-  if [[ -z "$image_id" ]]; then glance --os-image-api-version 1 image-create --name models-xenial-server --disk-format qcow2 --location http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img --container-format bare; fi
-
   echo "$0: $(date) tacker-setup part 1"
   bash utils/tacker-setup.sh init
   if [ $? -eq 1 ]; then fail; fi