From c667bd8bfec7f668c9fc0db5d58169ec3439a2a6 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 10 Apr 2019 17:41:52 +0400
Subject: [ha] Take out class with backports repo

* update system reclass
* rectify telemetry redis options

Change-Id: I6dca1ae52e7f7d73a90e53fceddca8e86872651b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit aebae197459879fd3ddcfaeb8ac1dce2d8fde046)
---
 .../classes/cluster/all-mcp-arch-common/passwords.yml       |  1 +
 .../classes/cluster/mcp-common-ha/openstack_control.yml.j2  |  1 +
 .../cluster/mcp-common-noha/openstack_control.yml.j2        | 13 ++++++++-----
 mcp/reclass/classes/system                                  |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'mcp')

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
index 0c6d274b4..f51563e7c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/passwords.yml
@@ -55,6 +55,7 @@ parameters:
     heat_domain_admin_password: ${_param:opnfv_main_password}
     ceilometer_influxdb_password: ${_param:opnfv_main_password}
     ceilometer_secret_key: ${_param:opnfv_main_password}
+    openstack_telemetry_redis_password: ${_param:opnfv_main_password}
 
     opendaylight_password: admin
 
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 227205e38..9e32c933a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -28,6 +28,7 @@ classes:
   - system.glusterfs.client.cluster
   - system.glusterfs.client.volume.glance
   - system.glusterfs.client.volume.keystone
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-ha.glusterfs_repo
 {%- if not conf.MCP_VCP %}
   # sync from kvm
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index c5e004ad1..ec75baa09 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -47,14 +47,9 @@ classes:
   - service.barbican.server.plugin.simple_crypto
   - service.redis.server.single
   - service.ceilometer.server.single
-  - system.ceilometer.server.coordination.redis
   - system.ceilometer.server.backend.default
   - system.aodh.server.single
-  - system.aodh.server.coordination.redis
   - system.gnocchi.server.single
-  - system.gnocchi.common.storage.incoming.redis
-  - system.gnocchi.common.storage.redis
-  - system.gnocchi.common.coordination.redis
   - service.panko.server.single
   - system.apache.server.site.gnocchi
   - system.apache.server.site.panko
@@ -175,6 +170,14 @@ parameters:
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}
+  gnocchi:
+    common:
+      storage:
+        driver: redis
+        redis_url: redis://${_param:single_address}:6379
+        incoming:
+          driver: redis
+          redis_url: redis://${_param:single_address}:6379
   nfs:
     server:
       share:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index cddeb5b6f..39baa623d 160000
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit cddeb5b6fdc6231ef6fbe8bd404f1f366ee92375
+Subproject commit 39baa623d525cd9a7eaedb5661e6b6730f0311b5
-- 
cgit 1.2.3-korg