Enable host-passthrough for virt control plane
PROD-36510
Change-Id: Iba943e4708c1c905e899671d0afcafc472565e75
diff --git a/defaults/salt/init.yml b/defaults/salt/init.yml
index 5947dec..77ca9e9 100644
--- a/defaults/salt/init.yml
+++ b/defaults/salt/init.yml
@@ -57,3 +57,4 @@
salt_minion_ca_authority: salt_master_ca
salt_master_api_bind_address: 0.0.0.0
+ salt_control_cluster_qemu_cpu_model: host-passthrough
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
index 669dc30..4c560e9 100644
--- a/salt/control/cluster/ceph_mon_cluster.yml
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:ceph_mon_backend_image}
size: ceph.mon
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
cmn02:
name: ${_param:ceph_mon_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:ceph_mon_backend_image}
size: ceph.mon
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
cmn03:
name: ${_param:ceph_mon_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:ceph_mon_backend_image}
size: ceph.mon
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/ceph_rgw_cluster.yml b/salt/control/cluster/ceph_rgw_cluster.yml
index 20dd3ed..4cbb2a2 100644
--- a/salt/control/cluster/ceph_rgw_cluster.yml
+++ b/salt/control/cluster/ceph_rgw_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:ceph_rgw_backend_image}
size: ceph.rgw
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
rgw02:
name: ${_param:ceph_rgw_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:ceph_rgw_backend_image}
size: ceph.rgw
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
rgw03:
name: ${_param:ceph_rgw_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:ceph_rgw_backend_image}
size: ceph.rgw
cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/cicd_control_cluster.yml b/salt/control/cluster/cicd_control_cluster.yml
index df061e9..57bb4be 100644
--- a/salt/control/cluster/cicd_control_cluster.yml
+++ b/salt/control/cluster/cicd_control_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:cicd_control_backend_image}
size: cicd.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
cid02:
name: ${_param:cicd_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:cicd_control_backend_image}
size: cicd.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
cid03:
name: ${_param:cicd_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:cicd_control_backend_image}
size: cicd.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_idm_cluster.yml b/salt/control/cluster/infra_idm_cluster.yml
index 7e9b481..e8bfb8d 100644
--- a/salt/control/cluster/infra_idm_cluster.yml
+++ b/salt/control/cluster/infra_idm_cluster.yml
@@ -30,6 +30,7 @@
backend: ${_param:infra_idm_backend_image}
size: infra.idm
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
idm02:
name: ${_param:infra_idm_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -37,6 +38,7 @@
backend: ${_param:infra_idm_backend_image}
size: infra.idm
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
idm03:
name: ${_param:infra_idm_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -44,3 +46,4 @@
backend: ${_param:infra_idm_backend_image}
size: infra.idm
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_integration_single.yml b/salt/control/cluster/infra_integration_single.yml
index 0003441..b7a337b 100644
--- a/salt/control/cluster/infra_integration_single.yml
+++ b/salt/control/cluster/infra_integration_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:infra_integration_backend_image}
size: infra.integration
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_integration}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_maas_single.yml b/salt/control/cluster/infra_maas_single.yml
index 4654670..34cff2c 100644
--- a/salt/control/cluster/infra_maas_single.yml
+++ b/salt/control/cluster/infra_maas_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:infra_maas_backend_image}
size: infra.maas
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_maas}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_proxy_cluster.yml b/salt/control/cluster/infra_proxy_cluster.yml
index 7d0454d..3a7677b 100644
--- a/salt/control/cluster/infra_proxy_cluster.yml
+++ b/salt/control/cluster/infra_proxy_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
prx02:
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_proxy_single.yml b/salt/control/cluster/infra_proxy_single.yml
index c9110f8..20ee30b 100644
--- a/salt/control/cluster/infra_proxy_single.yml
+++ b/salt/control/cluster/infra_proxy_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_storage_single.yml b/salt/control/cluster/infra_storage_single.yml
index b119b26..4962cb6 100644
--- a/salt/control/cluster/infra_storage_single.yml
+++ b/salt/control/cluster/infra_storage_single.yml
@@ -28,3 +28,4 @@
backend: ${_param:infra_storage_backend_image}
size: infra.storage
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_storage}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/infra_version_control_single.yml b/salt/control/cluster/infra_version_control_single.yml
index a77f959..1956ad2 100644
--- a/salt/control/cluster/infra_version_control_single.yml
+++ b/salt/control/cluster/infra_version_control_single.yml
@@ -28,3 +28,4 @@
backend: ${_param:infra_version_control_backend_image}
size: infra.version_control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_version_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
index 4ea65b5..023838e 100644
--- a/salt/control/cluster/kubernetes_control_cluster.yml
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ctl02:
name: ${_param:kubernetes_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ctl03:
name: ${_param:kubernetes_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index 35e559c..7ff4531 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:kubernetes_proxy_backend_image}
size: kubernetes.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
prx02:
name: ${_param:kubernetes_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,4 +37,5 @@
backend: ${_param:kubernetes_proxy_backend_image}
size: kubernetes.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
index f3de786..f45c4c8 100644
--- a/salt/control/cluster/opencontrail_analytics_cluster.yml
+++ b/salt/control/cluster/opencontrail_analytics_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
nal02:
name: ${_param:opencontrail_analytics_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
nal03:
name: ${_param:opencontrail_analytics_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
index 2189738..6f25376 100644
--- a/salt/control/cluster/opencontrail_control_cluster.yml
+++ b/salt/control/cluster/opencontrail_control_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ntw02:
name: ${_param:opencontrail_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ntw03:
name: ${_param:opencontrail_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_barbican_cluster.yml b/salt/control/cluster/openstack_barbican_cluster.yml
index ed82bd4..cc03d7b 100644
--- a/salt/control/cluster/openstack_barbican_cluster.yml
+++ b/salt/control/cluster/openstack_barbican_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
kmn02:
name: ${_param:openstack_barbican_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
kmn03:
name: ${_param:openstack_barbican_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_baremetal_cluster.yml b/salt/control/cluster/openstack_baremetal_cluster.yml
index faad1e9..224a662 100644
--- a/salt/control/cluster/openstack_baremetal_cluster.yml
+++ b/salt/control/cluster/openstack_baremetal_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
bmt02:
name: ${_param:openstack_baremetal_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
bmt03:
name: ${_param:openstack_baremetal_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_baremetal_single.yml b/salt/control/cluster/openstack_baremetal_single.yml
index 59d2c51..03f32f6 100644
--- a/salt/control/cluster/openstack_baremetal_single.yml
+++ b/salt/control/cluster/openstack_baremetal_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index 3d2bacd..dfe7eb8 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:openstack_benchmark_backend_image}
size: openstack.benchmark
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_benchmark}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
index ae724e9..c2b41eb 100644
--- a/salt/control/cluster/openstack_billing_single.yml
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -28,3 +28,4 @@
backend: ${_param:openstack_billing_backend_image}
size: openstack.billing
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_billing}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
index 8ed8a5e..b3f62e7 100644
--- a/salt/control/cluster/openstack_control_cluster.yml
+++ b/salt/control/cluster/openstack_control_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_control_backend_image}
size: openstack.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ctl02:
name: ${_param:openstack_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_control_backend_image}
size: openstack.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
ctl03:
name: ${_param:openstack_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_control_backend_image}
size: openstack.control
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
index 56ecd2f..81bfb54 100644
--- a/salt/control/cluster/openstack_database_cluster.yml
+++ b/salt/control/cluster/openstack_database_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_database_backend_image}
size: openstack.database
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
dbs02:
name: ${_param:openstack_database_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_database_backend_image}
size: openstack.database
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
dbs03:
name: ${_param:openstack_database_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_database_backend_image}
size: openstack.database
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_dns_cluster.yml b/salt/control/cluster/openstack_dns_cluster.yml
index 62120d0..5612ec0 100644
--- a/salt/control/cluster/openstack_dns_cluster.yml
+++ b/salt/control/cluster/openstack_dns_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_dns_backend_image}
size: openstack.dns
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
dns02:
name: ${_param:openstack_dns_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
backend: ${_param:openstack_dns_backend_image}
size: openstack.dns
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index dd64751..c3d8c6e 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
gtw02:
name: ${_param:openstack_gateway_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
gtw03:
name: ${_param:openstack_gateway_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_gateway_single.yml b/salt/control/cluster/openstack_gateway_single.yml
index 285385c..e05bac0 100644
--- a/salt/control/cluster/openstack_gateway_single.yml
+++ b/salt/control/cluster/openstack_gateway_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
index 25f959b..0c05bc3 100644
--- a/salt/control/cluster/openstack_manila_cluster.yml
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
share02:
name: ${_param:openstack_share_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
share03:
name: ${_param:openstack_share_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
index cccc408..c3b76db 100644
--- a/salt/control/cluster/openstack_message_queue_cluster.yml
+++ b/salt/control/cluster/openstack_message_queue_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
msg02:
name: ${_param:openstack_message_queue_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
msg03:
name: ${_param:openstack_message_queue_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_proxy_cluster.yml b/salt/control/cluster/openstack_proxy_cluster.yml
index 4027e00..63fa972 100644
--- a/salt/control/cluster/openstack_proxy_cluster.yml
+++ b/salt/control/cluster/openstack_proxy_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
prx02:
name: ${_param:openstack_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
index 386d024..65add11 100644
--- a/salt/control/cluster/openstack_proxy_single.yml
+++ b/salt/control/cluster/openstack_proxy_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index d53bb45..e657d58 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mdb02:
name: ${_param:openstack_telemetry_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mdb03:
name: ${_param:openstack_telemetry_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/openstack_upgrade_single.yml b/salt/control/cluster/openstack_upgrade_single.yml
index 6223867..004715e 100644
--- a/salt/control/cluster/openstack_upgrade_single.yml
+++ b/salt/control/cluster/openstack_upgrade_single.yml
@@ -28,3 +28,4 @@
backend: ${_param:openstack_upgrade_backend_image}
size: openstack.upgrade
cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_upgrade}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
index 57cef8e..a5ff589 100644
--- a/salt/control/cluster/rsyslog_single.yml
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:rsyslog_backend_image}
size: infra.rsyslog
cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_rsyslog}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
index 8e979ca..537e227 100644
--- a/salt/control/cluster/stacklight_log_cluster.yml
+++ b/salt/control/cluster/stacklight_log_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
log02:
name: ${_param:stacklight_log_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
log03:
name: ${_param:stacklight_log_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
index 169f096..1c1c5c1 100644
--- a/salt/control/cluster/stacklight_server_cluster.yml
+++ b/salt/control/cluster/stacklight_server_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mon02:
name: ${_param:stacklight_monitor_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mon03:
name: ${_param:stacklight_monitor_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
index c360b0e..619d587 100644
--- a/salt/control/cluster/stacklight_telemetry_cluster.yml
+++ b/salt/control/cluster/stacklight_telemetry_cluster.yml
@@ -29,6 +29,7 @@
backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mtr02:
name: ${_param:stacklight_telemetry_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
mtr03:
name: ${_param:stacklight_telemetry_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}
diff --git a/salt/control/cluster/stacklight_telemetry_single.yml b/salt/control/cluster/stacklight_telemetry_single.yml
index 709dc95..298f4ba 100644
--- a/salt/control/cluster/stacklight_telemetry_single.yml
+++ b/salt/control/cluster/stacklight_telemetry_single.yml
@@ -29,3 +29,4 @@
backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+ cpu_mode: ${_param:salt_control_cluster_qemu_cpu_model}