OpenStack cluster size contrail
Change-Id: I170a5c10efb2982e27bba0a1f169e387bd6b67d2
Related: PROD-30317 (PROD:30317)
(cherry picked from commit c039b1f70449c9d4199caac28e9e11e27f361b1e)
diff --git a/salt/control/sizes/opencontrail/medium.yml b/salt/control/sizes/opencontrail/medium.yml
index 3690a11..94a002a 100644
--- a/salt/control/sizes/opencontrail/medium.yml
+++ b/salt/control/sizes/opencontrail/medium.yml
@@ -1,12 +1,12 @@
parameters:
_param:
- salt_control_size_cpu_opencontrail_control: 8
- salt_control_size_ram_opencontrail_control: 65536
+ salt_control_size_cpu_opencontrail_control: 12
+ salt_control_size_ram_opencontrail_control: 32768
salt_control_size_disk_profile_opencontrail_control: large
salt_control_size_net_profile_opencontrail_control: default
- salt_control_size_cpu_opencontrail_analytics: 16
- salt_control_size_ram_opencontrail_analytics: 98304
- salt_control_size_disk_profile_opencontrail_analytics: xhuge
+ salt_control_size_cpu_opencontrail_analytics: 12
+ salt_control_size_ram_opencontrail_analytics: 49152
+ salt_control_size_disk_profile_opencontrail_analytics: huge
salt_control_size_net_profile_opencontrail_analytics: default
salt:
control:
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
index cadaa79..d8a89b5 100644
--- a/salt/control/sizes/openstack/medium.yml
+++ b/salt/control/sizes/openstack/medium.yml
@@ -14,7 +14,7 @@
salt_control_size_net_profile_openstack_message_queue: default
salt_control_size_cpu_openstack_proxy: 4
salt_control_size_ram_openstack_proxy: 16384
- salt_control_size_disk_profile_openstack_proxy: small
+ salt_control_size_disk_profile_openstack_proxy: xxlarge
salt_control_size_net_profile_openstack_proxy: default
salt_control_size_cpu_openstack_upgrade: 8
salt_control_size_ram_openstack_upgrade: 16384
@@ -24,8 +24,8 @@
salt_control_size_ram_openstack_share: 4096
salt_control_size_disk_profile_openstack_share: large
salt_control_size_net_profile_openstack_share: default
- salt_control_size_cpu_openstack_dns: 4
- salt_control_size_ram_openstack_dns: 6144
+ 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_net_profile_openstack_dns: default
salt_control_size_cpu_openstack_telemetry: 8
@@ -33,8 +33,8 @@
salt_control_size_disk_profile_openstack_telemetry: large
salt_control_size_net_profile_openstack_telemetry: default
salt_control_size_cpu_openstack_barbican: 4
- salt_control_size_ram_openstack_barbican: 16384
- salt_control_size_disk_profile_openstack_barbican: large
+ salt_control_size_ram_openstack_barbican: 8192
+ salt_control_size_disk_profile_openstack_barbican: small
salt_control_size_net_profile_openstack_barbican: default
salt_control_size_cpu_openstack_baremetal: 16
salt_control_size_ram_openstack_baremetal: 16384
@@ -67,18 +67,6 @@
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
- openstack.upgrade:
- cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
- ram: ${_param:salt_control_size_ram_openstack_upgrade}
- disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
- net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
- image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
- openstack.share:
- cpu: ${_param:salt_control_size_cpu_openstack_share}
- ram: ${_param:salt_control_size_ram_openstack_share}
- disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
- net_profile: ${_param:salt_control_size_net_profile_openstack_share}
- image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
@@ -97,9 +85,3 @@
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
- openstack.baremetal:
- cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
- ram: ${_param:salt_control_size_ram_openstack_baremetal}
- disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
- image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/stacklight/medium.yml b/salt/control/sizes/stacklight/medium.yml
index 16a19e1..a1793d4 100644
--- a/salt/control/sizes/stacklight/medium.yml
+++ b/salt/control/sizes/stacklight/medium.yml
@@ -1,15 +1,15 @@
parameters:
_param:
salt_control_size_cpu_stacklight_log: 16
- salt_control_size_ram_stacklight_log: 49152
+ salt_control_size_ram_stacklight_log: 32768
salt_control_size_disk_profile_stacklight_log: xxhuge
salt_control_size_net_profile_stacklight_log: default
salt_control_size_cpu_stacklight_server: 12
- salt_control_size_ram_stacklight_server: 65536
- salt_control_size_disk_profile_stacklight_server: xxlarge
+ salt_control_size_ram_stacklight_server: 49152
+ salt_control_size_disk_profile_stacklight_server: huge
salt_control_size_net_profile_stacklight_server: default
salt_control_size_cpu_stacklight_telemetry: 12
- salt_control_size_ram_stacklight_telemetry: 98304
+ salt_control_size_ram_stacklight_telemetry: 49152
salt_control_size_disk_profile_stacklight_telemetry: xhuge
salt_control_size_net_profile_stacklight_telemetry: default
salt: