fix compatibility problem with reclass 1.4.1
Change-Id: I6af9c84dd270dcbdcee21af05fb5b380bd523f23
Related: PROD-21428
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