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