Merge "Change name of StackLight node definitions to match reclass/system"
diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster/sl-k8s-calico/infra/config.yml
index ca4485d..a66cd51 100644
--- a/classes/cluster/sl-k8s-calico/infra/config.yml
+++ b/classes/cluster/sl-k8s-calico/infra/config.yml
@@ -90,7 +90,7 @@
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
node:
- stacklight_monitor_node01:
+ stacklight_server_node01:
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -104,7 +104,7 @@
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_monitor_node02:
+ stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -117,7 +117,7 @@
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_monitor_node03:
+ stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index 2a83d69..6e66f64 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -112,7 +112,7 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_proxy_node01_address}
- stacklight_monitor_node01:
+ stacklight_server_node01:
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -126,7 +126,7 @@
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_monitor_node02:
+ stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -139,7 +139,7 @@
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_monitor_node03:
+ stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index 4dbee00..ba4fe44 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -160,7 +160,7 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:openstack_proxy_node01_address}
- stacklight_monitor_node01:
+ stacklight_server_node01:
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -172,7 +172,7 @@
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
- stacklight_monitor_node02:
+ stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -183,7 +183,7 @@
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
- stacklight_monitor_node03:
+ stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index 510527f..6477821 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -145,7 +145,7 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:openstack_proxy_node01_address}
- stacklight_monitor_node01:
+ stacklight_server_node01:
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -159,7 +159,7 @@
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_monitor_node02:
+ stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -172,7 +172,7 @@
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_monitor_node03:
+ stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
@@ -185,3 +185,4 @@
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
+