add changed image for MCORD Spirent scenario
Change-Id: I2fed7a4cdb9b2559278ae0bec95c4e329fb84173
(cherry picked from commit ad127f951806539d3f63a5496e38cb29cba0f9f6)
diff --git a/profile_manifests/mcord-spirent.yml b/profile_manifests/mcord-spirent.yml
index 9b5cb6c..4f5fe05 100644
--- a/profile_manifests/mcord-spirent.yml
+++ b/profile_manifests/mcord-spirent.yml
@@ -258,14 +258,14 @@
url: "http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img.20170201"
checksum: "sha256:ebf007ba3ec1043b7cd011fc6668e2a1d1d4c69c41071e8513ab355df7a057cb"
- - name: "vsg-1.1"
- url: "http://www.vicci.org/cord/vsg-1.1.img"
- checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
+ - name: "image-venb"
+ url: "http://www.vicci.org/cord/venb-20171031.qcow2"
+ checksum: "sha256:df05f61f2876cb06d6a25ae9b238fad4a0a3d292f8101af2d71fd3c7c806a670"
- - name: "ceilometer-trusty-server-multi-nic"
- url: "http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2"
- checksum: "sha256:b77ef8d692b640568dea13df99fe1dfcb1f4bb4ac05408db9ff77399b34f754f"
+ - name: "image-spgwc"
+ url: "http://www.vicci.org/cord/ngic-cp1.qcow2.20171101"
+ checksum: "sha256:5a9cd6ab61f1a943d7f99aa019fb6a3328869d28b3e3ef5618dab90c067b9788"
- - name: "ceilometer-service-trusty-server-multi-nic"
- url: "http://www.vicci.org/cord/ceilometer-service-trusty-server-multi-nic.compressed.qcow2.20170131"
- checksum: "sha256:f0341e283f0f2cb8f70cd1a6347e0081c9c8492ef34eb6397c657ef824800d4f"
+ - name: "image-spgwu"
+ url: "http://www.vicci.org/cord/ngic-dp1.qcow2.20171101"
+ checksum: "sha256:1837358efa156793c6dd07771681acd41b1562d8a765933a77255de6912619df"
\ No newline at end of file
diff --git a/roles/cord-profile/templates/mcord-spirent-services.yml.j2 b/roles/cord-profile/templates/mcord-spirent-services.yml.j2
index 716121d..98a508c 100644
--- a/roles/cord-profile/templates/mcord-spirent-services.yml.j2
+++ b/roles/cord-profile/templates/mcord-spirent-services.yml.j2
@@ -69,10 +69,20 @@
name: m1.xlarge
must-exist: true
- trusty-server-multi-nic:
+ image-venb:
type: tosca.nodes.Image
properties:
- name: trusty-server-multi-nic
+ name: image-venb
+
+ image-spgwc:
+ type: tosca.nodes.Image
+ properties:
+ name: image-spgwc
+
+ image-spgwu:
+ type: tosca.nodes.Image
+ properties:
+ name: image-spgwu
# management networks, fully created in management-net.yaml
management:
@@ -172,10 +182,10 @@
node: service#venb
relationship: tosca.relationships.BelongsToOne
- default_image:
- node: trusty-server-multi-nic
+ node: image-venb
relationship: tosca.relationships.BelongsToOne
- default_flavor:
- node: m1.small
+ node: m1.xlarge
relationship: tosca.relationships.BelongsToOne
venb_instance1:
@@ -262,10 +272,10 @@
node: service#vspgwc
relationship: tosca.relationships.BelongsToOne
- default_image:
- node: trusty-server-multi-nic
+ node: image-spgwc
relationship: tosca.relationships.BelongsToOne
- default_flavor:
- node: m1.small
+ node: m1.large
relationship: tosca.relationships.BelongsToOne
intel_vspgwc:
@@ -274,10 +284,10 @@
name: intel_vspgwc
requirements:
- image:
- node: trusty-server-multi-nic
+ node: image-spgwc
relationship: tosca.relationships.BelongsToOne
- flavor:
- node: m1.small
+ node: m1.large
relationship: tosca.relationships.BelongsToOne
serviceinstance#vspgwc_instance:
@@ -347,10 +357,10 @@
node: service#vspgwu
relationship: tosca.relationships.BelongsToOne
- default_image:
- node: trusty-server-multi-nic
+ node: image-spgwu
relationship: tosca.relationships.BelongsToOne
- default_flavor:
- node: m1.small
+ node: m1.xlarge
relationship: tosca.relationships.BelongsToOne
intel_vspgwu:
@@ -359,10 +369,10 @@
name: intel_vspgwu
requirements:
- image:
- node: trusty-server-multi-nic
+ node: image-spgwu
relationship: tosca.relationships.BelongsToOne
- flavor:
- node: m1.small
+ node: m1.xlarge
relationship: tosca.relationships.BelongsToOne
serviceinstance#vspgwu_instance: