use vsg-1.1 image
Change-Id: I49ed4440222975572994477221040465e4f5b017
diff --git a/cord-pod-ansible/vars/cord-pod_defaults.yml b/cord-pod-ansible/vars/cord-pod_defaults.yml
index dcba503..926553b 100644
--- a/cord-pod-ansible/vars/cord-pod_defaults.yml
+++ b/cord-pod-ansible/vars/cord-pod_defaults.yml
@@ -38,7 +38,7 @@
- { name: "vtr", yaml: "{{ xos_services_dir }}/vtr/xos/vtr-onboard.yaml" }
images:
- - { name: "vsg-1.0", filename: "vsg-1.0.img", url: "http://www.vicci.org/cord/vsg-1.0.img" }
+ - { name: "vsg-1.1", filename: "vsg-1.1.img", url: "http://www.vicci.org/cord/vsg-1.1.img" }
config_recipes:
- { name: "setup", yaml: "{{ setup_dir }}/setup.yaml" }
diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index 898d34c..9fcfd23 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -173,8 +173,8 @@
#TODO: Add logic for service VM custom image (ceilometer-service-trusty-server-multi-nic)
bash -c "source ./admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || glance image-create --name ceilometer-trusty-server-multi-nic --disk-format qcow2 --file ./images/ceilometer-trusty-server-multi-nic.compressed.qcow2 --container-format bare"
-vsg_custom_images: images/vsg-1.0.img
- bash -c "source ./admin-openrc.sh; glance image-show vsg-1.0 || glance image-create --name vsg-1.0 --disk-format qcow2 --file ./images/vsg-1.0.img --container-format bare"
+vsg_custom_images: images/vsg-1.1.img
+ bash -c "source ./admin-openrc.sh; glance image-show vsg-1.1 || glance image-create --name vsg-1.1 --disk-format qcow2 --file ./images/vsg-1.1.img --container-format bare"
images/ceilometer-trusty-server-multi-nic.img: images
bash -c "source ../setup/admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || wget http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2 -P ./images"
@@ -183,8 +183,8 @@
#TODO: Add logic for service VM custom image (ceilometer-service-trusty-server-multi-nic) once image is uploaded into vicci portal
#bash -c "source ../setup/admin-openrc.sh; glance image-show ceilometer-service-trusty-server-multi-nic || wget http://www.vicci.org/cord/ceilometer-service-trusty-server-multi-nic.compressed.qcow2 -P ./images"
-images/vsg-1.0.img: images
- [ -s images/vsg-1.0.img ] || wget http://www.vicci.org/cord/vsg-1.0.img -P ./images
+images/vsg-1.1.img: images
+ [ -s images/vsg-1.1.img ] || wget http://www.vicci.org/cord/vsg-1.1.img -P ./images
images:
mkdir -p ./images
diff --git a/cord-pod/cord-services.yaml b/cord-pod/cord-services.yaml
index 66b69ff..725af7c 100644
--- a/cord-pod/cord-services.yaml
+++ b/cord-pod/cord-services.yaml
@@ -126,7 +126,7 @@
no-delete: true
no-update: true
- image#vsg-1.0:
+ image#vsg-1.1:
type: tosca.nodes.Image
mysite:
@@ -168,5 +168,5 @@
node: management
relationship: tosca.relationships.ConnectsToNetwork
- image:
- node: image#vsg-1.0
+ node: image#vsg-1.1
relationship: tosca.relationships.DefaultImage