Normalize SL mon node address parameter name in sl_os_contrail
Change-Id: I7708ceb3348f6cd0547d21614e1c1715c7806c22
diff --git a/classes/cluster/sl_os_contrail/stacklight/init.yml b/classes/cluster/sl_os_contrail/stacklight/init.yml
index 3d7d83f..18ff098 100755
--- a/classes/cluster/sl_os_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/init.yml
@@ -4,9 +4,9 @@
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_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
stacklight_log_address: ${_param:stacklight_monitor_address}
prometheus_control_address: ${_param:stacklight_monitor_address}
@@ -27,17 +27,17 @@
- 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}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- ${_param:stacklight_node02_hostname}
- ${_param:stacklight_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}
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 8697478..747ac71 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -37,11 +37,11 @@
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
cluster_node01_hostname: mon01
- cluster_node01_address: ${_param:stacklight_node01_address}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
cluster_node02_hostname: mon02
- cluster_node02_address: ${_param:stacklight_node02_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
cluster_node03_hostname: mon03
- cluster_node03_address: ${_param:stacklight_node03_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
grafana_admin_password: admin
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}