fix compatibility problem with reclass 1.4.1
Change-Id: I6af9c84dd270dcbdcee21af05fb5b380bd523f23
Related: PROD-21428
diff --git a/salt/control/placement/cicd/compact.yml b/salt/control/placement/cicd/compact.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/compact.yml
+++ b/salt/control/placement/cicd/compact.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/large.yml b/salt/control/placement/cicd/large.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/large.yml
+++ b/salt/control/placement/cicd/large.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/medium.yml b/salt/control/placement/cicd/medium.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/medium.yml
+++ b/salt/control/placement/cicd/medium.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/minimal.yml b/salt/control/placement/cicd/minimal.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/minimal.yml
+++ b/salt/control/placement/cicd/minimal.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/cicd/small.yml b/salt/control/placement/cicd/small.yml
index 4d9ecbe..9bdf4a4 100644
--- a/salt/control/placement/cicd/small.yml
+++ b/salt/control/placement/cicd/small.yml
@@ -11,15 +11,18 @@
cluster:
internal:
node:
- ${_param:cicd_control_node01_hostname}:
+ cid01:
+ name: ${_param:cicd_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node02_hostname}:
+ cid02:
+ name: ${_param:cicd_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: cicd.control
- ${_param:cicd_control_node03_hostname}:
+ cid03:
+ name: ${_param:cicd_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: cicd.control
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/compact.yml b/salt/control/placement/opencontrail/compact.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/compact.yml
+++ b/salt/control/placement/opencontrail/compact.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/large.yml b/salt/control/placement/opencontrail/large.yml
index e3d9c8d..1aabd0d 100644
--- a/salt/control/placement/opencontrail/large.yml
+++ b/salt/control/placement/opencontrail/large.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/medium.yml b/salt/control/placement/opencontrail/medium.yml
index ff2952d..dfc32f3 100644
--- a/salt/control/placement/opencontrail/medium.yml
+++ b/salt/control/placement/opencontrail/medium.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/minimal.yml b/salt/control/placement/opencontrail/minimal.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/minimal.yml
+++ b/salt/control/placement/opencontrail/minimal.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/opencontrail/small.yml b/salt/control/placement/opencontrail/small.yml
index 544537d..a619956 100644
--- a/salt/control/placement/opencontrail/small.yml
+++ b/salt/control/placement/opencontrail/small.yml
@@ -14,27 +14,33 @@
cluster:
internal:
node:
- ${_param:opencontrail_control_node01_hostname}:
+ ntw01:
+ name: ${_param:opencontrail_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node02_hostname}:
+ ntw02:
+ name: ${_param:opencontrail_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_control_node03_hostname}:
+ ntw03:
+ name: ${_param:opencontrail_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.control
- ${_param:opencontrail_analytics_node01_hostname}:
+ nal01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node02_hostname}:
+ nal02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
- ${_param:opencontrail_analytics_node03_hostname}:
+ nal03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: opencontrail.analytics
\ No newline at end of file
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index 650d4d9..cb056dd 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -26,55 +26,68 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node04_hostname}:
+ ctl04:
+ name: ${_param:openstack_control_node04_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node05_hostname}:
+ ctl05:
+ name: ${_param:openstack_control_node05_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index de9c010..7d0e166 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -22,47 +22,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -19,47 +19,58 @@
cluster:
internal:
node:
- ${_param:openstack_control_node01_hostname}:
+ ctl01:
+ name: ${_param:openstack_control_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node02_hostname}:
+ ctl02:
+ name: ${_param:openstack_control_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_control_node03_hostname}:
+ ctl03:
+ name: ${_param:openstack_control_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.control
- ${_param:openstack_database_node01_hostname}:
+ dbs01:
+ name: ${_param:openstack_database_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node02_hostname}:
+ dbs02:
+ name: ${_param:openstack_database_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_database_node03_hostname}:
+ dbs03:
+ name: ${_param:openstack_database_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.database
- ${_param:openstack_message_queue_node01_hostname}:
+ msg01:
+ name: ${_param:openstack_message_queue_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node02_hostname}:
+ msg02:
+ name: ${_param:openstack_message_queue_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_message_queue_node03_hostname}:
+ msg03:
+ name: ${_param:openstack_message_queue_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.message_queue
- ${_param:openstack_proxy_node01_hostname}:
+ prx01:
+ name: ${_param:openstack_proxy_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: openstack.proxy
- ${_param:openstack_proxy_node02_hostname}:
+ prx02:
+ name: ${_param:openstack_proxy_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: openstack.proxy
diff --git a/salt/control/placement/stacklight/compact.yml b/salt/control/placement/stacklight/compact.yml
index a84443d..2cde570 100644
--- a/salt/control/placement/stacklight/compact.yml
+++ b/salt/control/placement/stacklight/compact.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/large.yml b/salt/control/placement/stacklight/large.yml
index 46c2890..7b380d8 100644
--- a/salt/control/placement/stacklight/large.yml
+++ b/salt/control/placement/stacklight/large.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node13_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node14_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node15_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/medium.yml b/salt/control/placement/stacklight/medium.yml
index 117b2f5..7f54f4d 100644
--- a/salt/control/placement/stacklight/medium.yml
+++ b/salt/control/placement/stacklight/medium.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ lop02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node10_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node11_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node12_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/minimal.yml b/salt/control/placement/stacklight/minimal.yml
index a84443d..2cde570 100644
--- a/salt/control/placement/stacklight/minimal.yml
+++ b/salt/control/placement/stacklight/minimal.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file
diff --git a/salt/control/placement/stacklight/small.yml b/salt/control/placement/stacklight/small.yml
index 2e039ff..e16a7cb 100644
--- a/salt/control/placement/stacklight/small.yml
+++ b/salt/control/placement/stacklight/small.yml
@@ -17,39 +17,48 @@
cluster:
internal:
node:
- ${_param:stacklight_telemetry_node01_hostname}:
+ mtr01:
+ name: ${_param:stacklight_telemetry_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node02_hostname}:
+ mtr02:
+ name: ${_param:stacklight_telemetry_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_telemetry_node03_hostname}:
+ mtr03:
+ name: ${_param:stacklight_telemetry_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.telemetry
- ${_param:stacklight_log_node01_hostname}:
+ log01:
+ name: ${_param:stacklight_log_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node02_hostname}:
+ log02:
+ name: ${_param:stacklight_log_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_log_node03_hostname}:
+ log03:
+ name: ${_param:stacklight_log_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.log
- ${_param:stacklight_monitor_node01_hostname}:
+ mon01:
+ name: ${_param:stacklight_monitor_node01_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node02_hostname}:
+ mon02:
+ name: ${_param:stacklight_monitor_node02_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
size: stacklight.server
- ${_param:stacklight_monitor_node03_hostname}:
+ mon03:
+ name: ${_param:stacklight_monitor_node03_hostname}
image: ${_param:salt_control_xenial_image}
provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
size: stacklight.server
\ No newline at end of file