| commit | 55c0f6098c5586290dfac46daa2b0a0aa61a77e6 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <ddmitriev@mirantis.com> | Thu Jul 13 21:03:29 2017 +0300 |
| committer | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Jul 14 00:39:55 2017 +0300 |
| tree | 9948391a7fa31a09c9f5253feafda9aadbd9f49b | |
| parent | 943b7619745a5b2ab89a3b0876ba1770f75aaa7d [diff] |
Fix interpolation collision between openstack/stacklight for cicd Change-Id: I76265afbcb9085b86f805e08f8f4daee260b8657
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}