From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 5 Aug 2018 17:20:04 +0000 (+0200)
Subject: [noha] cinder: Align VG name with HA scenarios
X-Git-Tag: opnfv-7.0.0~117^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F60629%2F1;p=fuel.git

[noha] cinder: Align VG name with HA scenarios

Prepare for MaaS integration in NOHA scenarios by aligning cinder
VG naming across all scenarios.

JIRA: FUEL-382

Change-Id: I0cd7accf573ae0904efddd7aa67d880f2a6deb71
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index a027113ae..5c9c16d6b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -49,6 +49,10 @@ parameters:
         host: ${_param:openstack_control_address}
   cinder:
     volume:
+      backend:
+        lvm-driver:
+          # Align system.cinder.volume.backend.lvm and MaaS data
+          volume_group: ${linux:storage:lvm:cinder-vg:name}
       my_ip: ${_param:single_address}
       database:
         host: ${_param:cluster_local_address}
@@ -68,6 +72,11 @@ parameters:
           fstype: nfs
           device: ${_param:openstack_control_address}:/srv/nova/instances
   linux:
+    storage:
+      lvm:
+        # Align with both system.cinder.volume.backend.lvm and MaaS data
+        cinder-vg:
+          name: vgroot
     system:
       kernel:
         sysctl: