clean up references to default_flavor
diff --git a/xos/configurations/acord/ceilometer.yaml b/xos/configurations/acord/ceilometer.yaml
index ff56579..66d5d32 100644
--- a/xos/configurations/acord/ceilometer.yaml
+++ b/xos/configurations/acord/ceilometer.yaml
@@ -164,6 +164,9 @@
ceilometer-trusty-server-multi-nic:
type: tosca.nodes.Image
+ m1.small:
+ type: tosca.nodes.Flavor
+
mysite_ceilometer:
description: Ceilometer Proxy Slice
type: tosca.nodes.Slice
@@ -177,8 +180,10 @@
- default_image:
node: ceilometer-trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
+ - m1.small:
+ node: m1.small
+ relationship: tosca.relationships.DefaultFlavor
properties:
- default_flavor: m1.small
max_instances: 2
# mysite_sflow:
diff --git a/xos/configurations/cord-deprecated/ceilometer.yaml b/xos/configurations/cord-deprecated/ceilometer.yaml
index 3724265..464b07b 100644
--- a/xos/configurations/cord-deprecated/ceilometer.yaml
+++ b/xos/configurations/cord-deprecated/ceilometer.yaml
@@ -164,6 +164,9 @@
ceilometer-trusty-server-multi-nic:
type: tosca.nodes.Image
+ m1.small:
+ type: tosca.nodes.Flavor
+
mysite_ceilometer:
description: Ceilometer Proxy Slice
type: tosca.nodes.Slice
@@ -177,8 +180,9 @@
- default_image:
node: ceilometer-trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- properties:
- default_flavor: m1.small
+ - default_flavor:
+ node: m1.small
+ relationship: tosca.relationships.DefaultFlavor
# mysite_sflow:
# description: Slice for sFlow service
diff --git a/xos/configurations/cord-pod/ceilometer.yaml b/xos/configurations/cord-pod/ceilometer.yaml
index 3b32345..d07f2e9 100644
--- a/xos/configurations/cord-pod/ceilometer.yaml
+++ b/xos/configurations/cord-pod/ceilometer.yaml
@@ -171,6 +171,9 @@
ceilometer-trusty-server-multi-nic:
type: tosca.nodes.Image
+ m1.small:
+ type: tosca.nodes.Flavor
+
mysite_ceilometer:
description: Ceilometer Proxy Slice
type: tosca.nodes.Slice
@@ -187,8 +190,9 @@
- management:
node: management
relationship: tosca.relationships.ConnectsToNetwork
- properties:
- default_flavor: m1.small
+ - m1.small:
+ node: m1.small
+ relationship: tosca.relationships.DefaultFlavor
# mysite_sflow:
# description: Slice for sFlow service
diff --git a/xos/tosca/samples/helloworld-chain.yaml b/xos/tosca/samples/helloworld-chain.yaml
index 8b49106..f6e6b84 100644
--- a/xos/tosca/samples/helloworld-chain.yaml
+++ b/xos/tosca/samples/helloworld-chain.yaml
@@ -43,6 +43,8 @@
node: service_helloworld
relationship: tosca.relationships.MemberOfService
+ m1.small:
+ type: tosca.nodes.Flavor
mysite_helloworld:
type: tosca.nodes.Slice
@@ -56,8 +58,9 @@
- default_image:
node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- properties:
- default_flavor: m1.small
+ - default_flavor:
+ node: m1.small
+ relationship: tosca.relationships.DefaultFlavor
helloworld_access:
type: tosca.nodes.network.Network
diff --git a/xos/tosca/samples/slice_default_image.yaml b/xos/tosca/samples/slice_default_image.yaml
index 91b95c7..ff63373 100644
--- a/xos/tosca/samples/slice_default_image.yaml
+++ b/xos/tosca/samples/slice_default_image.yaml
@@ -16,6 +16,9 @@
trusty-server-multi-nic:
type: tosca.nodes.Image
+ m1.small:
+ type: tosca.nodes.Flavor
+
mysite_test1:
type: tosca.nodes.Slice
requirements:
@@ -25,6 +28,6 @@
- default_image:
node: trusty-server-multi-nic
relationship: tosca.relationships.DefaultImage
- properties:
- default_flavor: m1.small
-
+ -default_flavor:
+ node: m1.small
+ relationship: tosca.relationships.DefaultFlavor