Fix interpolation collision between openstack/stacklight for cicd
Change-Id: I76265afbcb9085b86f805e08f8f4daee260b8657
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
index 0bbe57c..5bdbb9a 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -89,8 +89,9 @@
keepalived_vip_virtual_router_id: 180
keepalived_vip_password: TLrAYaAbAEZwXsp1
keepalived_vip_interface: ens3
- cluster_vip_address: ${_param:control_vip_address}
control_vip_address: ${_param:cicd_control_address}
+ cluster_vip_address: ${_param:control_vip_address}
+ glusterfs_service_host: ${_param:control_vip_address}
cluster_public_host: ${_param:control_vip_address}
salt_api_password: Dnx3fapzHIcGuURdDck3DPv78V3ehwue
# Docker images and versions
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
index 2241bae..6ad2afa 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
@@ -37,6 +37,7 @@
- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
+ glusterfs_service_host: ${_param:cluster_vip_address}
keepalived_vip_interface: ens4
keepalived_openstack_telemetry_vip_interface: ens4
linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index 100bcd8..7d4f5f2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -78,7 +78,6 @@
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
- glusterfs_service_host: ${_param:cluster_vip_address}
designate_service_host: ${_param:cluster_vip_address}
metadata_password: password
mysql_admin_user: root
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
index 16a9faf..8d3e10e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
@@ -16,10 +16,6 @@
stacklight_log_address: ${_param:stacklight_monitor_address}
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
- # Glusterfs
- glusterfs_service_host: ${_param:stacklight_monitor_address}
-
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
index 956ee51..3b6d25e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
@@ -8,7 +8,7 @@
- cluster.virtual-mcp-ocata-cicd.infra
parameters:
_param:
- cluster_public_host: ${_param:prometheus_control_address}
+ #cluster_public_host: ${_param:prometheus_control_address}
nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index c5684a1..1270bbb 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -53,6 +53,8 @@
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
openstack_version: newton
+ # Glusterfs
+ glusterfs_service_host: ${_param:stacklight_monitor_address}
# Grafana
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}