changed 'default_image' for all slices to 'trusty-server-multi-nic'
commented out all parts of mcord.yaml which make tenant instances
(it will be done statically at MWC)
Change-Id: I1d99ab1cd70194a701084ab64e3d107f123fbe85
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index d08e936..7d74c53 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -519,7 +519,7 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
- default_image:
- node: bbu
+ node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.xlarge
@@ -549,7 +549,7 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
- default_image:
- node: pgwc
+ node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.large
@@ -580,7 +580,7 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
- default_image:
- node: sgwc
+ node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.large
@@ -609,7 +609,7 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
- default_image:
- node: mme
+ node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- default_flavor:
node: m1.large
@@ -627,57 +627,57 @@
network: noauto
# default_node: compute1
- tenant#vPGWU:
- type: tosca.nodes.VPGWCTenant
- properties:
- display_message: just a message
- image_name: pgwu
- requirements:
- - tenant:
- node: vPGWC
- relationship: tosca.relationships.MemberOfService
- - dependency:
- node: mysite_vpgwc_slice1
- relationship: tosca.relationships.DependsOn
+ # tenant#vPGWU:
+ # type: tosca.nodes.VPGWCTenant
+ # properties:
+ # display_message: just a message
+ # image_name: pgwu
+ # requirements:
+ # - tenant:
+ # node: vPGWC
+ # relationship: tosca.relationships.MemberOfService
+ # - dependency:
+ # node: mysite_vpgwc_slice1
+ # relationship: tosca.relationships.DependsOn
- tenant#vPGWC:
- type: tosca.nodes.VPGWCTenant
- properties:
- display_message: just a message
- image_name: trusty-server-multi-nic
- requirements:
- - tenant:
- node: vPGWC
- relationship: tosca.relationships.MemberOfService
- - dependency:
- node: mysite_vpgwc_slice1
- relationship: tosca.relationships.DependsOn
+ # tenant#vPGWC:
+ # type: tosca.nodes.VPGWCTenant
+ # properties:
+ # display_message: just a message
+ # image_name: trusty-server-multi-nic
+ # requirements:
+ # - tenant:
+ # node: vPGWC
+ # relationship: tosca.relationships.MemberOfService
+ # - dependency:
+ # node: mysite_vpgwc_slice1
+ # relationship: tosca.relationships.DependsOn
- tenant#vmmetenant1:
- type: tosca.nodes.VMMETenant
- properties:
- tenant_message: just a message
- image_name: default
- requirements:
- - tenant:
- node: vMME
- relationship: tosca.relationships.MemberOfService
- - dependency:
- node: mysite_vmme_slice1
- relationship: tosca.relationships.DependsOn
+ # tenant#vmmetenant1:
+ # type: tosca.nodes.VMMETenant
+ # properties:
+ # tenant_message: just a message
+ # image_name: default
+ # requirements:
+ # - tenant:
+ # node: vMME
+ # relationship: tosca.relationships.MemberOfService
+ # - dependency:
+ # node: mysite_vmme_slice1
+ # relationship: tosca.relationships.DependsOn
- tenant#vmmetenant2:
- type: tosca.nodes.VMMETenant
- properties:
- tenant_message: just a message 2
- image_name: trusty-server-multi-nic
- requirements:
- - tenant:
- node: vMME
- relationship: tosca.relationships.MemberOfService
- - dependency:
- node: mysite_vmme_slice1
- relationship: tosca.relationships.DependsOn
+ # tenant#vmmetenant2:
+ # type: tosca.nodes.VMMETenant
+ # properties:
+ # tenant_message: just a message 2
+ # image_name: trusty-server-multi-nic
+ # requirements:
+ # - tenant:
+ # node: vMME
+ # relationship: tosca.relationships.MemberOfService
+ # - dependency:
+ # node: mysite_vmme_slice1
+ # relationship: tosca.relationships.DependsOn