From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 4 Apr 2019 13:24:54 +0000 (+0400)
Subject: Define stub for cinder service in keystone
X-Git-Tag: opnfv-8.0.0~18
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4f20f97431cff7741f90b3f8dc6df2521bb3c220;p=fuel.git

Define stub for cinder service in keystone

Required only for Rally validation in cinder scenarios,
there is no useful functionaly in terms of cluster.

Change-Id: Idc4d62cbbc9974972e9d492b5a419342077e3d9a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
index 93548f6bd..aaa5e65f0 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
@@ -30,6 +30,10 @@ parameters:
           services:
             ceilometer:
               status: absent
+            # required only for Rally validation
+            cinder:
+              type: volume
+              description: OpenStack Volume Service
       server:
         identity:
           admin:
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 77476ac63..c5e004ad1 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
@@ -102,6 +102,10 @@ parameters:
           services:
             ceilometer:
               status: absent
+            # required only for Rally validation
+            cinder:
+              type: volume
+              description: OpenStack Volume Service
       server:
         identity:
           admin: