commit ecba506c600106a30c4bc73ec32319adc3c1cc2e
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Sep 14 07:53:10 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Fri Sep 14 07:53:10 2018 +0000
tree 0fb3032fc49dfe0e50105f66e10b0340c2be962e
parent 06e08ed0a5eff0dc78c0ce4882b9f74ea2aa67ab
parent 69fdd3fa8fbb944e20ae43e2f54293a4ecaf2a06

Merge "Add x509 opts to designate.server.cluster.default"

apache/server/site/manila.yml

diff --git a/apache/server/site/manila.yml b/apache/server/site/manila.yml
index cecf1d4..3080d1d 100644
--- a/apache/server/site/manila.yml
+++ b/apache/server/site/manila.yml
@@ -12,6 +12,8 @@
     server:
       enabled: true
       default_mpm: event
+      modules:
+        - wsgi
       site:
         manila:
           enabled: false

manila/share/backend/lvm.yml

diff --git a/manila/share/backend/lvm.yml b/manila/share/backend/lvm.yml
index fe709da..9f5c660 100644
--- a/manila/share/backend/lvm.yml
+++ b/manila/share/backend/lvm.yml
@@ -1,12 +1,13 @@
 parameters:
   _param:
     manila_share_address: ${_param:single_address}
+    manila_lvm_volume_name: manila-volume
   linux:
     storage:
       lvm:
         manila-vg:
           enabled: true
-          name: manila-volume
+          name: ${_param:manila_lvm_volume_name}
           devices: ${_param:manila_lvm_devices}
     system:
       package:
@@ -25,4 +26,4 @@
             - "${_param:manila_share_address}"
           dhss: false
           share_driver: manila.share.drivers.lvm.LVMShareDriver
-          lvm_share_volume_group: manila-volume
+          lvm_share_volume_group: ${_param:manila_lvm_volume_name}