commit 5b5b024a2e37094ed5e1a672c9ac65f33baa4a16
author Martin Polreich <mpolreich@mirantis.com> Fri Oct 13 10:33:23 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Fri Oct 13 10:33:23 2017 +0000
tree 701ccc4fcc0b517aaa690a24eb6e0e96d55e96d5
parent e0dfc28abc8fee45d40255e979d432fa2ded50d4
parent ac9e3d9efed3fbc37ac7bf48126eca7e288ab1f9

Merge "Fix Ceilometer service host"

classes/cluster/sl-os-contrail/stacklight/client.yml

diff --git a/classes/cluster/sl-os-contrail/stacklight/client.yml b/classes/cluster/sl-os-contrail/stacklight/client.yml
index 4f6323a..7373bd3 100755
--- a/classes/cluster/sl-os-contrail/stacklight/client.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/client.yml
@@ -17,3 +17,4 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15016
+    stacklight_prometheus_port: 15010

classes/cluster/sl-os-ovs/stacklight/client.yml

diff --git a/classes/cluster/sl-os-ovs/stacklight/client.yml b/classes/cluster/sl-os-ovs/stacklight/client.yml
index fde267a..607fe5f 100644
--- a/classes/cluster/sl-os-ovs/stacklight/client.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/client.yml
@@ -17,3 +17,4 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15016
+    stacklight_prometheus_port: 15010

classes/system

diff --git a/classes/system b/classes/system
index 2d83bb8..c314d5a 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 2d83bb86822e8790a37c4b7cbe7b7afee9282105
+Subproject commit c314d5a3af310a7cfe198619be3f5aa15c0b25a5