commit 0343b6859b0e70e8da10bd795f421713679eb84f
author Vasyl Saienko <vsaienko@mirantis.com> Mon Sep 17 14:21:38 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Wed Sep 19 11:28:22 2018 +0000
tree b35118806038fa1c60efb98ac167b3b1183a9d39
parent 83a6c79a781b6532a4955823c03adba3d191e16c

Ceilometer take into account cluster_internal_protocol variable

Change-Id: I0f6f60ecb1e229a04904dbbb613538d424385bbb
Related-Prod: PROD-18315

ceilometer/agent/cluster.yml

diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index a598ee5..769ff68 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -15,6 +15,7 @@
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       message_queue:
         engine: rabbitmq
         members:

ceilometer/agent/single.yml

diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index ebb1d60..0b0bbc3 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -1,2 +1,7 @@
 classes:
 - service.ceilometer.agent.single
+parameters:
+  ceilometer:
+    agent:
+      identity:
+        protocol: ${_param:internal_protocol}

ceilometer/agent/telemetry/cluster.yml

diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index bc67493..b761fd0 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -15,6 +15,7 @@
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       message_queue:
         engine: rabbitmq
         members:

ceilometer/agent/telemetry/single.yml

diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 6b42537..93a4c27 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -1,2 +1,7 @@
 classes:
 - service.ceilometer.agent.single.common
+parameters:
+  ceilometer:
+    agent:
+      identity:
+        protocol: ${_param:internal_protocol}

ceilometer/server/cluster.yml

diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index ad804f8..4a24dda 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -30,6 +30,7 @@
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       message_queue:
         engine: rabbitmq
         members:

ceilometer/server/single.yml

diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index ae642f1..5f56244 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -15,3 +15,5 @@
           enabled: true
           host: ${_param:stacklight_monitor_address}
           port: 9200
+      identity:
+        protocol: ${_param:cluster_internal_protocol}

ceilometer/server/telemetry/cluster.yml

diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index fdf3e03..9a361eb 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -26,6 +26,7 @@
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       message_queue:
         engine: rabbitmq
         members:

ceilometer/server/telemetry/single.yml

diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 2d8828c..8dfb277 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -4,3 +4,5 @@
   ceilometer:
     server:
       role: ${_param:openstack_node_role}
+      identity:
+        protocol: ${_param:internal_protocol}