OpenStack cluster size contrail
Change-Id: I170a5c10efb2982e27bba0a1f169e387bd6b67d2
Related: PROD-30317 (PROD:30317)
diff --git a/salt/control/placement/opencontrail/medium.yml b/salt/control/placement/opencontrail/medium.yml
index e596bcb..f75e760 100644
--- a/salt/control/placement/opencontrail/medium.yml
+++ b/salt/control/placement/opencontrail/medium.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- infra_kvm07_hostname: kvm07
- infra_kvm08_hostname: kvm08
- infra_kvm09_hostname: kvm09
+ infra_kvm04_hostname: kvm04
+ infra_kvm05_hostname: kvm05
+ infra_kvm06_hostname: kvm06
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02
opencontrail_control_node03_hostname: ntw03
@@ -34,41 +34,41 @@
name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_control_backend_image}
- provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
ntw02:
name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_control_backend_image}
- provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
ntw03:
name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_control_backend_image}
- provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
nal01:
name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_analytics_backend_image}
- provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
nal02:
name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_analytics_backend_image}
- provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
nal03:
name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:opencontrail_analytics_backend_image}
- provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index 6867e3a..d2a8507 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -17,10 +17,17 @@
openstack_message_queue_node03_hostname: msg03
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_dns_node01_hostname: dns01
+ openstack_dns_node02_hostname: dns02
+ openstack_barbican_node01_hostname: kmn01
+ openstack_barbican_node02_hostname: kmn02
+ openstack_barbican_node03_hostname: kmn03
openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
salt_control_cluster_node_cloud_init_openstack_control:
user_data:
write_files:
@@ -49,6 +56,20 @@
${salt:control:size:openstack.proxy:image_layout}
owner: root:root
path: /usr/share/growlvm/image-layout.yml
+ salt_control_cluster_node_cloud_init_openstack_dns:
+ user_data:
+ write_files:
+ - content: |
+ ${salt:control:size:openstack.dns:image_layout}
+ owner: root:root
+ path: /usr/share/growlvm/image-layout.yml
+ salt_control_cluster_node_cloud_init_openstack_barbican:
+ user_data:
+ write_files:
+ - content: |
+ ${salt:control:size:openstack.barbican:image_layout}
+ owner: root:root
+ path: /usr/share/growlvm/image-layout.yml
salt:
control:
cluster:
@@ -100,34 +121,69 @@
name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:openstack_message_queue_backend_image}
- provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
msg02:
name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:openstack_message_queue_backend_image}
- provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
msg03:
name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:openstack_message_queue_backend_image}
- provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
prx01:
name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:openstack_proxy_backend_image}
- provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
prx02:
name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:openstack_proxy_backend_image}
- provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+ dns01:
+ name: ${_param:openstack_dns_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+ dns02:
+ name: ${_param:openstack_dns_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.dns
+ cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+ kmn01:
+ name: ${_param:openstack_barbican_node01_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+ kmn02:
+ name: ${_param:openstack_barbican_node02_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+ kmn03:
+ name: ${_param:openstack_barbican_node03_hostname}
+ image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ size: openstack.barbican
+ cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
diff --git a/salt/control/placement/stacklight/medium.yml b/salt/control/placement/stacklight/medium.yml
index d8279c6..4bfd44c 100644
--- a/salt/control/placement/stacklight/medium.yml
+++ b/salt/control/placement/stacklight/medium.yml
@@ -1,8 +1,8 @@
parameters:
_param:
- infra_kvm10_hostname: kvm10
- infra_kvm11_hostname: kvm11
- infra_kvm12_hostname: kvm12
+ infra_kvm04_hostname: kvm04
+ infra_kvm05_hostname: kvm05
+ infra_kvm06_hostname: kvm06
stacklight_log_node01_hostname: log01
stacklight_log_node02_hostname: log02
stacklight_log_node03_hostname: log03
@@ -45,62 +45,62 @@
name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_telemetry_backend_image}
- provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
mtr02:
name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_telemetry_backend_image}
- provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
mtr03:
name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_telemetry_backend_image}
- provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
log01:
name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_log_backend_image}
- provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
log02:
name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_log_backend_image}
- provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
log03:
name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_log_backend_image}
- provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
mon01:
name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_monitor_backend_image}
- provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
mon02:
name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_monitor_backend_image}
- provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
mon03:
name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
backend: ${_param:stacklight_monitor_backend_image}
- provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
+ provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
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: