Update M-CORD TOSCA recipes (too many conflicts in cherry-picks)
Change-Id: I37fb3af9b2297c9e05bb87b394d5cba5bb98229d
diff --git a/roles/cord-profile/templates/s11-net.yaml.j2 b/roles/cord-profile/templates/s11-net.yaml.j2
index ce5ee43..f44b0fd 100644
--- a/roles/cord-profile/templates/s11-net.yaml.j2
+++ b/roles/cord-profile/templates/s11-net.yaml.j2
@@ -8,7 +8,6 @@
- custom_types/network.yaml
- custom_types/networktemplate.yaml
-
description: network for S11 interface
topology_template:
@@ -20,12 +19,6 @@
properties:
name: {{ site_name }}
-# mysite_vMME_slice:
-# type: tosca.nodes.Slice
-# properties:
-# must-exist: true
-# name: mysite_vMME_slice
-
# s11 network
s11_template:
type: tosca.nodes.NetworkTemplate
@@ -40,6 +33,7 @@
properties:
name: s11_network
subnet: 112.0.0.0/24
+ permit_all_slices: true
requirements:
- template:
node: s11_template
@@ -47,10 +41,6 @@
- owner:
node: {{ site_name }}_s11
relationship: tosca.relationships.BelongsToOne
- # - slices:
- # node: mysite_vMME_slice
- # relationship: tosca.relationships.BelongsToMany
-
{{ site_name }}_s11:
description: This slice exists solely to own the private network
@@ -58,6 +48,7 @@
properties:
name: {{ site_name }}_s11
default_isolation: vm
+ network: noauto
requirements:
- site:
node: {{ site_name }}