Update minimal size
For development/testing purposes we shouldn't use regular control plane VMs sizes
to save HW resources. For that we need to upgrade "minimal" value of "openstack_cluster_size"
variable from cookiecutter templates and describe the sizes in reclass-system .
The sizes should be set according to "minimal." flavors from Architecturies document
Minimal size was created by https://gerrit.mcp.mirantis.com/#/c/18279/
for CI and not described in public documentd and no client affected.
Depends-On: https://gerrit.mcp.mirantis.com/#/c/34789/
Change-Id: I8d463080be43aad427d5f6941d721efd76ce156a
Prod-related: PROD-26630 (PROD:26630)
diff --git a/salt/control/sizes/cicd/minimal.yml b/salt/control/sizes/cicd/minimal.yml
index f420bb9..baf480f 100644
--- a/salt/control/sizes/cicd/minimal.yml
+++ b/salt/control/sizes/cicd/minimal.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- salt_control_size_cpu_cicd_control: 8
- salt_control_size_ram_cicd_control: 8192
- salt_control_size_disk_profile_cicd_control: small
+ salt_control_size_cpu_cicd_control: 2
+ salt_control_size_ram_cicd_control: 4096
+ salt_control_size_disk_profile_cicd_control: minimal_xsmall
salt_control_size_net_profile_cicd_control: default
salt:
control:
diff --git a/salt/control/sizes/opencontrail/minimal.yml b/salt/control/sizes/opencontrail/minimal.yml
index de7fa6d..4fd93a1 100644
--- a/salt/control/sizes/opencontrail/minimal.yml
+++ b/salt/control/sizes/opencontrail/minimal.yml
@@ -1,12 +1,12 @@
parameters:
_param:
- salt_control_size_cpu_opencontrail_control: 8
- salt_control_size_ram_opencontrail_control: 12288
- salt_control_size_disk_profile_opencontrail_control: small
+ salt_control_size_cpu_opencontrail_control: 2
+ salt_control_size_ram_opencontrail_control: 4096
+ salt_control_size_disk_profile_opencontrail_control: minimal_xsmall
salt_control_size_net_profile_opencontrail_control: default
- salt_control_size_cpu_opencontrail_analytics: 12
+ salt_control_size_cpu_opencontrail_analytics: 4
salt_control_size_ram_opencontrail_analytics: 8192
- salt_control_size_disk_profile_opencontrail_analytics: medium
+ salt_control_size_disk_profile_opencontrail_analytics: large
salt_control_size_net_profile_opencontrail_analytics: default
salt:
control:
diff --git a/salt/control/sizes/openstack/minimal.yml b/salt/control/sizes/openstack/minimal.yml
index b3b2a85..ac07075 100644
--- a/salt/control/sizes/openstack/minimal.yml
+++ b/salt/control/sizes/openstack/minimal.yml
@@ -1,44 +1,44 @@
parameters:
_param:
- salt_control_size_cpu_openstack_control: 8
- salt_control_size_ram_openstack_control: 12288
- salt_control_size_disk_profile_openstack_control: small
+ salt_control_size_cpu_openstack_control: 6
+ salt_control_size_ram_openstack_control: 16384
+ salt_control_size_disk_profile_openstack_control: minimal_xsmall
salt_control_size_net_profile_openstack_control: default
- salt_control_size_cpu_openstack_database: 6
- salt_control_size_ram_openstack_database: 8192
- salt_control_size_disk_profile_openstack_database: medium
+ salt_control_size_cpu_openstack_database: 1
+ salt_control_size_ram_openstack_database: 6144
+ salt_control_size_disk_profile_openstack_database: minimal_xxsmall
salt_control_size_net_profile_openstack_database: default
- salt_control_size_cpu_openstack_message_queue: 6
- salt_control_size_ram_openstack_message_queue: 8192
- salt_control_size_disk_profile_openstack_message_queue: small
+ salt_control_size_cpu_openstack_message_queue: 1
+ salt_control_size_ram_openstack_message_queue: 2048
+ salt_control_size_disk_profile_openstack_message_queue: xxxsmall
salt_control_size_net_profile_openstack_message_queue: default
- salt_control_size_cpu_openstack_proxy: 4
- salt_control_size_ram_openstack_proxy: 6144
- salt_control_size_disk_profile_openstack_proxy: small
+ salt_control_size_cpu_openstack_proxy: 1
+ salt_control_size_ram_openstack_proxy: 2048
+ salt_control_size_disk_profile_openstack_proxy: xxxsmall
salt_control_size_net_profile_openstack_proxy: default
salt_control_size_cpu_openstack_upgrade: 8
salt_control_size_ram_openstack_upgrade: 16384
- salt_control_size_disk_profile_openstack_upgrade: medium
+ salt_control_size_disk_profile_openstack_upgrade: minimal_xsmall
salt_control_size_net_profile_openstack_upgrade: default
salt_control_size_cpu_openstack_share: 1
salt_control_size_ram_openstack_share: 2048
- salt_control_size_disk_profile_openstack_share: large
+ salt_control_size_disk_profile_openstack_share: minimal_xsmall
salt_control_size_net_profile_openstack_share: default
- salt_control_size_cpu_openstack_dns: 2
- salt_control_size_ram_openstack_dns: 4096
- salt_control_size_disk_profile_openstack_dns: small
+ salt_control_size_cpu_openstack_dns: 1
+ salt_control_size_ram_openstack_dns: 2048
+ salt_control_size_disk_profile_openstack_dns: xxxsmall
salt_control_size_net_profile_openstack_dns: default
- salt_control_size_cpu_openstack_telemetry: 4
- salt_control_size_ram_openstack_telemetry: 6144
- salt_control_size_disk_profile_openstack_telemetry: small
+ salt_control_size_cpu_openstack_telemetry: 2
+ salt_control_size_ram_openstack_telemetry: 4096
+ salt_control_size_disk_profile_openstack_telemetry: minimal_medium
salt_control_size_net_profile_openstack_telemetry: default
salt_control_size_cpu_openstack_barbican: 4
- salt_control_size_ram_openstack_barbican: 6144
- salt_control_size_disk_profile_openstack_barbican: small
+ salt_control_size_ram_openstack_barbican: 8192
+ salt_control_size_disk_profile_openstack_barbican: xxxsmall
salt_control_size_net_profile_openstack_barbican: default
- salt_control_size_cpu_openstack_baremetal: 4
- salt_control_size_ram_openstack_baremetal: 4096
- salt_control_size_disk_profile_openstack_baremetal: small
+ salt_control_size_cpu_openstack_baremetal: 8
+ salt_control_size_ram_openstack_baremetal: 8192
+ salt_control_size_disk_profile_openstack_baremetal: xxxsmall
salt_control_size_net_profile_openstack_baremetal: default
salt:
control:
diff --git a/salt/control/sizes/ovs/minimal.yml b/salt/control/sizes/ovs/minimal.yml
index 0b822b4..37cef97 100644
--- a/salt/control/sizes/ovs/minimal.yml
+++ b/salt/control/sizes/ovs/minimal.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- salt_control_size_cpu_openstack_gateway: 4
- salt_control_size_ram_openstack_gateway: 16384
- salt_control_size_disk_profile_openstack_gateway: small
+ salt_control_size_cpu_openstack_gateway: 1
+ salt_control_size_ram_openstack_gateway: 2048
+ salt_control_size_disk_profile_openstack_gateway: minimal_xsmall
salt_control_size_net_profile_openstack_gateway: default
salt:
control:
diff --git a/salt/control/sizes/stacklight/minimal.yml b/salt/control/sizes/stacklight/minimal.yml
index d6256cf..48cfa1c 100644
--- a/salt/control/sizes/stacklight/minimal.yml
+++ b/salt/control/sizes/stacklight/minimal.yml
@@ -1,16 +1,16 @@
parameters:
_param:
- salt_control_size_cpu_stacklight_log: 4
+ salt_control_size_cpu_stacklight_log: 2
salt_control_size_ram_stacklight_log: 4096
- salt_control_size_disk_profile_stacklight_log: medium
+ salt_control_size_disk_profile_stacklight_log: minimal_xsmall
salt_control_size_net_profile_stacklight_log: default
- salt_control_size_cpu_stacklight_server: 4
- salt_control_size_ram_stacklight_server: 6144
+ salt_control_size_cpu_stacklight_server: 2
+ salt_control_size_ram_stacklight_server: 4096
salt_control_size_disk_profile_stacklight_server: small
salt_control_size_net_profile_stacklight_server: default
- salt_control_size_cpu_stacklight_telemetry: 4
- salt_control_size_ram_stacklight_telemetry: 4096
- salt_control_size_disk_profile_stacklight_telemetry: medium
+ salt_control_size_cpu_stacklight_telemetry: 2
+ salt_control_size_ram_stacklight_telemetry: 6144
+ salt_control_size_disk_profile_stacklight_telemetry: minimal_xsmall
salt_control_size_net_profile_stacklight_telemetry: default
salt:
control:
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 05bf23d..08c1bca 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -21,12 +21,24 @@
xxxsmall:
- system:
size: 8000
+ minimal_xxsmall:
+ - system:
+ size: 10000
xxsmall:
- system:
size: 15000
+ minimal_xsmall:
+ - system:
+ size: 20000
xsmall:
- system:
size: 30000
+ minimal_small:
+ - system:
+ size: 35000
+ minimal_medium:
+ - system:
+ size: 40000
small:
- system:
size: 50000