Fix class_mapping for SL nodes in SL OS Contrail
Change-Id: I4f06e146b4ec4130071dfdd18c9e00f322d38cf8
diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index 9108b97..36f82f8 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -75,21 +75,21 @@
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_node01_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_node02_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
node:
- stacklight_node01:
- name: ${_param:stacklight_node01_hostname}
+ stacklight_monitor_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.master.cluster
@@ -99,11 +99,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node01_address}
+ single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_node02:
- name: ${_param:stacklight_node02_hostname}
+ stacklight_monitor_node02:
+ name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -112,11 +112,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node02_address}
+ single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_node03:
- name: ${_param:stacklight_node03_hostname}
+ stacklight_monitor_node03:
+ name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -125,7 +125,7 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node03_address}
+ single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index f755342..0790d9d 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,12 +1,12 @@
parameters:
_param:
stacklight_address: 172.16.10.252
- stacklight_node01_hostname: mon01
- stacklight_node02_hostname: mon02
- stacklight_node03_hostname: mon03
- stacklight_node01_address: 172.16.10.107
- stacklight_node02_address: 172.16.10.108
- stacklight_node03_address: 172.16.10.109
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
# Glusterfs
glusterfs_service_host: ${_param:stacklight_address}
@@ -31,20 +31,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_node01_address}
+ address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_node03_address}
+ address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 531e283..ce40987 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -41,12 +41,12 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ${_param:primary_interface}
# Docker/Elasticsearch
- cluster_node01_hostname: ${_param:stacklight_node01_hostname}
- cluster_node01_address: ${_param:stacklight_node01_address}
- cluster_node02_hostname: ${_param:stacklight_node02_hostname}
- cluster_node02_address: ${_param:stacklight_node02_address}
- cluster_node03_hostname: ${_param:stacklight_node03_hostname}
- cluster_node03_address: ${_param:stacklight_node03_address}
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
diff --git a/classes/cluster/sl_k8s_contrail/infra/config.yml b/classes/cluster/sl_k8s_contrail/infra/config.yml
index 9af6915..71c8aa9 100644
--- a/classes/cluster/sl_k8s_contrail/infra/config.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/config.yml
@@ -80,20 +80,20 @@
cluster_param:
kubernetes_proxy_node01_address:
value_template: <<node_control_ip>>
- stacklight_node01:
+ stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
- stacklight_node02:
+ stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
- stacklight_node03:
+ stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
@@ -109,8 +109,8 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_proxy_node01_address}
- stacklight_node01:
- name: ${_param:stacklight_node01_hostname}
+ stacklight_monitor_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.master.cluster
@@ -120,11 +120,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node01_address}
+ single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_node02:
- name: ${_param:stacklight_node02_hostname}
+ stacklight_monitor_node02:
+ name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -133,11 +133,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node02_address}
+ single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_node03:
- name: ${_param:stacklight_node03_hostname}
+ stacklight_monitor_node03:
+ name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -146,7 +146,7 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node03_address}
+ single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
opencontrail_control_node01:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/init.yml b/classes/cluster/sl_k8s_contrail/stacklight/init.yml
index 3685807..261c6aa 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/init.yml
@@ -1,12 +1,12 @@
parameters:
_param:
stacklight_monitor_address: 172.16.10.251
- stacklight_node01_hostname: mon01
- stacklight_node02_hostname: mon02
- stacklight_node03_hostname: mon03
- stacklight_node01_address: 172.16.10.107
- stacklight_node02_address: 172.16.10.108
- stacklight_node03_address: 172.16.10.109
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
# GlusterFS
glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
@@ -29,20 +29,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_node01_address}
+ address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_node03_address}
+ address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index bb43c6e..1394b9e 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -53,12 +53,12 @@
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Docker/Elasticsearch
- cluster_node01_hostname: ${_param:stacklight_node01_hostname}
- cluster_node01_address: ${_param:stacklight_node01_address}
- cluster_node02_hostname: ${_param:stacklight_node02_hostname}
- cluster_node02_address: ${_param:stacklight_node02_address}
- cluster_node03_hostname: ${_param:stacklight_node03_hostname}
- cluster_node03_address: ${_param:stacklight_node03_address}
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index e1468e9..d9dc100 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -120,17 +120,17 @@
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_node01_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_node02_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
node:
openstack_control_node01:
diff --git a/classes/cluster/sl_os_contrail/stacklight/init.yml b/classes/cluster/sl_os_contrail/stacklight/init.yml
index 4c4e88f..37bca4c 100755
--- a/classes/cluster/sl_os_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/init.yml
@@ -1,9 +1,9 @@
parameters:
_param:
stacklight_monitor_address: 172.16.10.253
- stacklight_node01_hostname: mon01
- stacklight_node02_hostname: mon02
- stacklight_node03_hostname: mon03
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
stacklight_monitor_node01_address: 172.16.10.107
stacklight_monitor_node02_address: 172.16.10.108
stacklight_monitor_node03_address: 172.16.10.109
@@ -25,15 +25,15 @@
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index 0d5da93..8e49340 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -104,17 +104,17 @@
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_node01_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_node02_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
- stacklight_node03_address:
+ stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
node:
openstack_control_node01: