Setting up backend images for VCP VM's
This patchset is required by: #/c/25365/
Change-Id: I2aa73d3f16b10d2d7597a89f46fdeed6bf268661
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
index bccec01..39cee29 100644
--- a/salt/control/cluster/ceph_mon_cluster.yml
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ ceph_mon_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:ceph_mon_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:ceph_mon_backend_image}
size: ceph.mon
cmn02:
name: ${_param:ceph_mon_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:ceph_mon_backend_image}
size: ceph.mon
cmn03:
name: ${_param:ceph_mon_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
- size: ceph.mon
\ No newline at end of file
+ backend: ${_param:ceph_mon_backend_image}
+ size: ceph.mon
diff --git a/salt/control/cluster/ceph_rgw_cluster.yml b/salt/control/cluster/ceph_rgw_cluster.yml
index 6f24819..e0109db 100644
--- a/salt/control/cluster/ceph_rgw_cluster.yml
+++ b/salt/control/cluster/ceph_rgw_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ ceph_rgw_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:ceph_rgw_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:ceph_rgw_backend_image}
size: ceph.rgw
rgw02:
name: ${_param:ceph_rgw_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:ceph_rgw_backend_image}
size: ceph.rgw
rgw03:
name: ${_param:ceph_rgw_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
- size: ceph.rgw
\ No newline at end of file
+ backend: ${_param:ceph_rgw_backend_image}
+ size: ceph.rgw
diff --git a/salt/control/cluster/cicd_control_cluster.yml b/salt/control/cluster/cicd_control_cluster.yml
index 82366a8..33945e2 100644
--- a/salt/control/cluster/cicd_control_cluster.yml
+++ b/salt/control/cluster/cicd_control_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:cicd_control_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:cicd_control_backend_image}
size: cicd.control
cid02:
name: ${_param:cicd_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:cicd_control_backend_image}
size: cicd.control
cid03:
name: ${_param:cicd_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:cicd_control_backend_image}
size: cicd.control
diff --git a/salt/control/cluster/infra_idm_cluster.yml b/salt/control/cluster/infra_idm_cluster.yml
index ff135a1..f322910 100644
--- a/salt/control/cluster/infra_idm_cluster.yml
+++ b/salt/control/cluster/infra_idm_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_centos7_image_backend: /var/lib/libvirt/images/backends/centos7.qcow2
+ infra_idm_backend_image: ${_param:salt_control_centos7_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:infra_idm_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_centos7_image}
+ backend: ${_param:infra_idm_backend_image}
size: infra.idm
idm02:
name: ${_param:infra_idm_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_centos7_image}
+ backend: ${_param:infra_idm_backend_image}
size: infra.idm
idm03:
name: ${_param:infra_idm_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_centos7_image}
+ backend: ${_param:infra_idm_backend_image}
size: infra.idm
diff --git a/salt/control/cluster/infra_integration_single.yml b/salt/control/cluster/infra_integration_single.yml
index 66de895..0c774ab 100644
--- a/salt/control/cluster/infra_integration_single.yml
+++ b/salt/control/cluster/infra_integration_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ infra_integration_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:cicd_control_node01_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:infra_integration_backend_image}
size: infra.integration
diff --git a/salt/control/cluster/infra_maas_single.yml b/salt/control/cluster/infra_maas_single.yml
index d8675e8..9bd4fe2 100644
--- a/salt/control/cluster/infra_maas_single.yml
+++ b/salt/control/cluster/infra_maas_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ infra_maas_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,5 +19,6 @@
name: ${_param:infra_maas_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:infra_maas_backend_image}
size: infra.maas
diff --git a/salt/control/cluster/infra_proxy_cluster.yml b/salt/control/cluster/infra_proxy_cluster.yml
index f3453ff..00c9679 100644
--- a/salt/control/cluster/infra_proxy_cluster.yml
+++ b/salt/control/cluster/infra_proxy_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,9 +19,11 @@
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
prx02:
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
diff --git a/salt/control/cluster/infra_proxy_single.yml b/salt/control/cluster/infra_proxy_single.yml
index 7d092fa..483b2d4 100644
--- a/salt/control/cluster/infra_proxy_single.yml
+++ b/salt/control/cluster/infra_proxy_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:infra_proxy_backend_image}
size: infra.proxy
diff --git a/salt/control/cluster/infra_storage_single.yml b/salt/control/cluster/infra_storage_single.yml
index ca8ce26..b6c0a85 100644
--- a/salt/control/cluster/infra_storage_single.yml
+++ b/salt/control/cluster/infra_storage_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ infra_storage_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -15,4 +18,5 @@
sto01:
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:infra_storage_backend_image}
size: infra.storage
diff --git a/salt/control/cluster/infra_version_control_single.yml b/salt/control/cluster/infra_version_control_single.yml
index 10e01ab..d7e02d5 100644
--- a/salt/control/cluster/infra_version_control_single.yml
+++ b/salt/control/cluster/infra_version_control_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ infra_version_control_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -15,4 +18,5 @@
git01:
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:infra_version_control_backend_image}
size: infra.version_control
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
index c3049ec..252ccbf 100644
--- a/salt/control/cluster/kubernetes_control_cluster.yml
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ kubernetes_control_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:kubernetes_control_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
ctl02:
name: ${_param:kubernetes_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
ctl03:
name: ${_param:kubernetes_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:kubernetes_control_backend_image}
size: kubernetes.control
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index 379a333..0a47f39 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ kubernetes_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,10 +19,12 @@
name: ${_param:kubernetes_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:kubernetes_proxy_backend_image}
size: kubernetes.proxy
prx02:
name: ${_param:kubernetes_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:kubernetes_proxy_backend_image}
size: kubernetes.proxy
diff --git a/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
index 37fb60a..b4e7b75 100644
--- a/salt/control/cluster/opencontrail_analytics_cluster.yml
+++ b/salt/control/cluster/opencontrail_analytics_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ opencontrail_analytics_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:opencontrail_analytics_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
nal02:
name: ${_param:opencontrail_analytics_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
nal03:
name: ${_param:opencontrail_analytics_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_analytics_backend_image}
size: opencontrail.analytics
diff --git a/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
index 10ddf5e..9d2fbb9 100644
--- a/salt/control/cluster/opencontrail_control_cluster.yml
+++ b/salt/control/cluster/opencontrail_control_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ opencontrail_control_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:opencontrail_control_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
ntw02:
name: ${_param:opencontrail_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
ntw03:
name: ${_param:opencontrail_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:opencontrail_control_backend_image}
size: opencontrail.control
diff --git a/salt/control/cluster/openstack_barbican_cluster.yml b/salt/control/cluster/openstack_barbican_cluster.yml
index cfa7ba6..b24c0fa 100644
--- a/salt/control/cluster/openstack_barbican_cluster.yml
+++ b/salt/control/cluster/openstack_barbican_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_barbican_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
kmn02:
name: ${_param:openstack_barbican_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
kmn03:
name: ${_param:openstack_barbican_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_barbican_backend_image}
size: openstack.barbican
diff --git a/salt/control/cluster/openstack_baremetal_cluster.yml b/salt/control/cluster/openstack_baremetal_cluster.yml
index 4dd62e4..f166484 100644
--- a/salt/control/cluster/openstack_baremetal_cluster.yml
+++ b/salt/control/cluster/openstack_baremetal_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_baremetal_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
bmt02:
name: ${_param:openstack_baremetal_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
bmt03:
name: ${_param:openstack_baremetal_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
diff --git a/salt/control/cluster/openstack_baremetal_single.yml b/salt/control/cluster/openstack_baremetal_single.yml
index f0aa319..853f45e 100644
--- a/salt/control/cluster/openstack_baremetal_single.yml
+++ b/salt/control/cluster/openstack_baremetal_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:openstack_baremetal_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_baremetal_backend_image}
size: openstack.baremetal
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index ea10fc3..83c18f5 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_benchmark_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:openstack_benchmark_node01_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_benchmark_backend_image}
size: openstack.benchmark
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
index f8dacf7..36f9824 100644
--- a/salt/control/cluster/openstack_billing_single.yml
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_billing_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -15,4 +18,5 @@
bil01:
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_billing_backend_image}
size: openstack.control
diff --git a/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
index f28a7d0..328cfd0 100644
--- a/salt/control/cluster/openstack_control_cluster.yml
+++ b/salt/control/cluster/openstack_control_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_control_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_control_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_control_backend_image}
size: openstack.control
ctl02:
name: ${_param:openstack_control_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_control_backend_image}
size: openstack.control
ctl03:
name: ${_param:openstack_control_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_control_backend_image}
size: openstack.control
diff --git a/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
index 2a00308..acbcc36 100644
--- a/salt/control/cluster/openstack_database_cluster.yml
+++ b/salt/control/cluster/openstack_database_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_database_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_database_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_database_backend_image}
size: openstack.database
dbs02:
name: ${_param:openstack_database_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_database_backend_image}
size: openstack.database
dbs03:
name: ${_param:openstack_database_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_database_backend_image}
size: openstack.database
diff --git a/salt/control/cluster/openstack_dns_cluster.yml b/salt/control/cluster/openstack_dns_cluster.yml
index 7f1dbb8..6fcc546 100644
--- a/salt/control/cluster/openstack_dns_cluster.yml
+++ b/salt/control/cluster/openstack_dns_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,9 +19,11 @@
name: ${_param:openstack_dns_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
size: openstack.dns
dns02:
name: ${_param:openstack_dns_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_dns_backend_image}
size: openstack.dns
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index 1a7e06b..8475004 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_gateway_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
gtw02:
name: ${_param:openstack_gateway_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
gtw03:
name: ${_param:openstack_gateway_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
diff --git a/salt/control/cluster/openstack_gateway_single.yml b/salt/control/cluster/openstack_gateway_single.yml
index 801ee0c..e240d12 100644
--- a/salt/control/cluster/openstack_gateway_single.yml
+++ b/salt/control/cluster/openstack_gateway_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:openstack_gateway_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_gateway_backend_image}
size: openstack.gateway
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
index feb1d4f..477d6ca 100644
--- a/salt/control/cluster/openstack_manila_cluster.yml
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_manila_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_share_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
share02:
name: ${_param:openstack_share_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
share03:
name: ${_param:openstack_share_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_manila_backend_image}
size: openstack.manila
diff --git a/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
index cab5adb..f91faf6 100644
--- a/salt/control/cluster/openstack_message_queue_cluster.yml
+++ b/salt/control/cluster/openstack_message_queue_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_message_queue_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_message_queue_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
msg02:
name: ${_param:openstack_message_queue_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
msg03:
name: ${_param:openstack_message_queue_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_message_queue_backend_image}
size: openstack.message_queue
diff --git a/salt/control/cluster/openstack_proxy_cluster.yml b/salt/control/cluster/openstack_proxy_cluster.yml
index 628dcd8..87a5176 100644
--- a/salt/control/cluster/openstack_proxy_cluster.yml
+++ b/salt/control/cluster/openstack_proxy_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,10 +19,12 @@
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
prx02:
name: ${_param:openstack_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
diff --git a/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
index 8ad0baf..ca5c751 100644
--- a/salt/control/cluster/openstack_proxy_single.yml
+++ b/salt/control/cluster/openstack_proxy_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:openstack_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_proxy_backend_image}
size: openstack.proxy
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index 633b984..bbf6fd1 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
+ openstack_telemetry_backend_image: ${_param:salt_control_trusty_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:openstack_telemetry_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
mdb02:
name: ${_param:openstack_telemetry_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
mdb03:
name: ${_param:openstack_telemetry_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_trusty_image}
+ backend: ${_param:openstack_telemetry_backend_image}
size: openstack.telemetry
diff --git a/salt/control/cluster/openstack_upgrade_single.yml b/salt/control/cluster/openstack_upgrade_single.yml
index 3189f3e..0b5e0fb 100644
--- a/salt/control/cluster/openstack_upgrade_single.yml
+++ b/salt/control/cluster/openstack_upgrade_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ openstack_upgrade_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -15,4 +18,5 @@
upg01:
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:openstack_upgrade_backend_image}
size: openstack.upgrade
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
index 72e6c86..dd64869 100644
--- a/salt/control/cluster/rsyslog_single.yml
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ rsyslog_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:rsyslog_node01_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:rsyslog_backend_image}
size: infra.rsyslog
diff --git a/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
index e4c08b6..6d3dba9 100644
--- a/salt/control/cluster/stacklight_log_cluster.yml
+++ b/salt/control/cluster/stacklight_log_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:stacklight_log_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
log02:
name: ${_param:stacklight_log_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
log03:
name: ${_param:stacklight_log_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_log_backend_image}
size: stacklight.log
diff --git a/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
index 6e7da61..8ab6a9d 100644
--- a/salt/control/cluster/stacklight_server_cluster.yml
+++ b/salt/control/cluster/stacklight_server_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ stacklight_server_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:stacklight_monitor_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
mon02:
name: ${_param:stacklight_monitor_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
mon03:
name: ${_param:stacklight_monitor_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_server_backend_image}
size: stacklight.server
diff --git a/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
index 1b39b61..4a58a23 100644
--- a/salt/control/cluster/stacklight_telemetry_cluster.yml
+++ b/salt/control/cluster/stacklight_telemetry_cluster.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,14 +19,17 @@
name: ${_param:stacklight_telemetry_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
mtr02:
name: ${_param:stacklight_telemetry_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
mtr03:
name: ${_param:stacklight_telemetry_node03_hostname}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry
diff --git a/salt/control/cluster/stacklight_telemetry_single.yml b/salt/control/cluster/stacklight_telemetry_single.yml
index 81fd6fb..3012dc6 100644
--- a/salt/control/cluster/stacklight_telemetry_single.yml
+++ b/salt/control/cluster/stacklight_telemetry_single.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+ stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
salt:
control:
size:
@@ -16,4 +19,5 @@
name: ${_param:stacklight_telemetry_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
+ backend: ${_param:stacklight_telemetry_backend_image}
size: stacklight.telemetry