X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fmanila-generic-config.yaml;h=65884a947b07e91830181e75277a714eb0fae37b;hb=0bc2403ecfe995d3e1a40d40a30f4b63e57cceab;hp=a847a02b3816c5a5890c0707b302e1c915c43f45;hpb=00e926ef5a1a809bd0f6cf19b53b41419a19c2ae;p=apex-tripleo-heat-templates.git

diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml
index a847a02b..65884a94 100644
--- a/environments/manila-generic-config.yaml
+++ b/environments/manila-generic-config.yaml
@@ -1,17 +1,16 @@
 # 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::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
+  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
 
 parameter_defaults:
   ManilaServiceInstanceUser: ''
   ManilaServiceInstancePassword: ''
   ManilaServiceInstanceFlavorId: 2
   ManilaServiceNetworkCidr: '172.16.0.0/16'
-  ManilaGenericEnableBackend: true
   ManilaGenericBackendName: tripleo_generic
   ManilaGenericDriverHandlesShareServers: true
   ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf'