[MCORD-183] Fix Instance Creation Bug - Uncomment Default Image
Change-Id: Iff3db7e98b792fc2eb35bcb15c3ef82bf26139f6
diff --git a/roles/cord-profile/templates/mcord-services.yaml.j2 b/roles/cord-profile/templates/mcord-services.yaml.j2
index e2989b3..ade708e 100644
--- a/roles/cord-profile/templates/mcord-services.yaml.j2
+++ b/roles/cord-profile/templates/mcord-services.yaml.j2
@@ -25,10 +25,10 @@
m1.xlarge:
type: tosca.nodes.Flavor
- #image#trusty-server-multi-nic:
- # type: tosca.nodes.Image
- image#vsg-1.1:
+ trusty-server-multi-nic:
type: tosca.nodes.Image
+ #image#vsg-1.1:
+ # type: tosca.nodes.Image
# management networks, fully created in management-net.yaml
@@ -107,7 +107,6 @@
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
service#vpgwc:
type: tosca.nodes.VPGWCService
properties:
@@ -118,7 +117,6 @@
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
service#vsgw:
type: tosca.nodes.VSGWService
properties:
@@ -129,7 +127,6 @@
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
service#vhss:
type: tosca.nodes.VHSSService
properties:
@@ -140,7 +137,6 @@
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
# CORD Slices
mysite_vBBU_slice:
description: vBBU Service Slice
@@ -154,9 +150,9 @@
- vBBU:
node: service#vbbu
relationship: tosca.relationships.MemberOfService
- #- default_image:
- # node: trusty-server-multi-nic
- # relationship: tosca.relationships.DefaultImage
+ - default_image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.xlarge
relationship: tosca.relationships.DefaultFlavor
@@ -184,9 +180,9 @@
- vMME:
node: service#vmme
relationship: tosca.relationships.MemberOfService
- #- default_image:
- # node: trusty-server-multi-nic
- # relationship: tosca.relationships.DefaultImage
+ - default_image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.small
relationship: tosca.relationships.DefaultFlavor
@@ -209,9 +205,9 @@
- vHSS:
node: service#vhss
relationship: tosca.relationships.MemberOfService
- #- default_image:
- # node: trusty-server-multi-nic
- # relationship: tosca.relationships.DefaultImage
+ - default_image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.small
relationship: tosca.relationships.DefaultFlavor
@@ -237,9 +233,9 @@
- vSGW:
node: service#vsgw
relationship: tosca.relationships.MemberOfService
- #- default_image:
- # node: trusty-server-multi-nic
- # relationship: tosca.relationships.DefaultImage
+ - default_image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.small
relationship: tosca.relationships.DefaultFlavor
@@ -262,9 +258,9 @@
- vPGWC:
node: service#vpgwc
relationship: tosca.relationships.MemberOfService
- #- default_image:
- # node: trusty-server-multi-nic
- # relationship: tosca.relationships.DefaultImage
+ - default_image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.small
relationship: tosca.relationships.DefaultFlavor