Add possibility to use different flavors for different nodes types
PRODX-2628
Change-Id: If562185442fbdceec120a88228a7fa9253336067
diff --git a/de/heat-templates/env/compute.yaml b/de/heat-templates/env/compute.yaml
index 19a04cd..0a74783 100644
--- a/de/heat-templates/env/compute.yaml
+++ b/de/heat-templates/env/compute.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 2
worker_size: 3
diff --git a/de/heat-templates/env/converged.yaml b/de/heat-templates/env/converged.yaml
index 09ed375..03da84c 100644
--- a/de/heat-templates/env/converged.yaml
+++ b/de/heat-templates/env/converged.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 2
worker_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
index c028976..ec0ba7f 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 0
worker_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
index 2c56e07..390de69 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 0
worker_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
index f2d9b6f..aed2f89 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 0
worker_size: 3
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
index 11b9390..062a447 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 0
worker_size: 5
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
index 90e2d28..28d3fdf 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 0
worker_size: 5
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
index 8248b82..c89c863 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3-osd3.yaml
@@ -1,7 +1,13 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
+ ucp_flavor: system.compact.openstack.control
+ masters_flavor: system.compact.openstack.control
+ workers_flavor: system.compact.openstack.control
+ cmps_flavor: system.virtual.openstack.compute
+ gtws_flavor: system.compact.openstack.gateway
+ lmas_flavor: system.compact.stacklight.server
+ osds_flavor: system.virtual.ceph.osd
public_net_id: public
masters_size: 2
worker_size: 3
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
index 760b2df..62bb03e 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 2
worker_size: 3
diff --git a/de/heat-templates/env/telco.yaml b/de/heat-templates/env/telco.yaml
index 612083a..8abd2a8 100644
--- a/de/heat-templates/env/telco.yaml
+++ b/de/heat-templates/env/telco.yaml
@@ -1,7 +1,6 @@
parameters:
key_name: devcloud
image: bionic-server-cloudimg-amd64-20190612
- flavor: system.compact.openstack.control
public_net_id: public
masters_size: 2
worker_size: 3
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 30736be..4595008 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -7,9 +7,6 @@
image:
type: string
description: Name of image to use for servers
- flavor:
- type: string
- description: Flavor to use for servers
public_net_id:
type: string
description: >
@@ -62,6 +59,27 @@
osd_metadata:
type: json
default: {}
+ ucp_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ masters_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ workers_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ cmps_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ gtws_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ lmas_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
+ osds_flavor:
+ type: string
+ default: 'system.compact.openstack.control'
resources:
key_pair:
@@ -109,7 +127,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: ucp_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -129,7 +147,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: masters_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -150,7 +168,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: workers_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -171,7 +189,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: cmps_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -192,7 +210,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: gtws_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -213,7 +231,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: lmas_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }
@@ -234,7 +252,7 @@
type: ./srv-group.yaml
properties:
image: { get_param: image }
- flavor: { get_param: flavor }
+ flavor: { get_param: osds_flavor }
key_name: { get_param: "OS::stack_name" }
public_net_id: { get_param: public_net_id }
private_net_id: { get_resource: network }