Merge "Also match config volumes for /var/lib/config-data/puppet-generated/" into...

[apex-tripleo-heat-templates.git] / environments / manila-generic-config.yaml

diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml
index 74011c6..65884a9 100644 (file)
--- a/environments/manila-generic-config.yaml
+++ b/environments/manila-generic-config.yaml
@@ -1,14 +1,16 @@
-# A Heat environment file which can be used to enable a
-# a Manila generic driver backend.
+# This environment file enables Manila with the Generic backend.
 resource_registry:
-  OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml
-  OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
   # Only manila-share is pacemaker managed:
-  OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
-
+  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
 
 parameter_defaults:
-  ManilaGenericEnableBackend: true
+  ManilaServiceInstanceUser: ''
+  ManilaServiceInstancePassword: ''
+  ManilaServiceInstanceFlavorId: 2
+  ManilaServiceNetworkCidr: '172.16.0.0/16'
   ManilaGenericBackendName: tripleo_generic
   ManilaGenericDriverHandlesShareServers: true
   ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf'
@@ -20,7 +22,3 @@ parameter_defaults:
   ManilaGenericServiceInstanceSmbConfigPath: '$share_mount_path/smb.conf'
   ManilaGenericShareVolumeFsType: 'ext4'
   ManilaGenericCinderVolumeType: ''
-  ManilaGenericServiceInstanceUser: ''
-  ManilaGenericServiceInstancePassword: ''
-  ManilaGenericServiceInstanceFlavorId: 2
-  ManilaGenericServiceNetworkCidr: '172.16.0.0/16'