Conform configs to updated Redis v5.0 package

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_compute.yml

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 359ca13..0409974 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -22,7 +22,6 @@ parameters:
   _param:
     interface_mtu: 9000
     linux_system_codename: xenial
-    barbican_integration_enabled: true
   nova:
     compute:
       libvirt_service: libvirtd
@@ -38,6 +37,8 @@ parameters:
         password: ${_param:keystone_neutron_password}
       barbican:
         enabled: ${_param:barbican_integration_enabled}
+      image:
+        verify_glance_signatures: false
   neutron:
     compute:
       notification: true
@@ -50,6 +51,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}
@@ -69,6 +74,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: