Remove non-containerized pacemaker resources on upgrade

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

diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml
index 98de6ad..7eb1494 100644 (file)
--- a/environments/manila-netapp-config.yaml
+++ b/environments/manila-netapp-config.yaml
@@ -1,13 +1,12 @@
 # This environment file enables Manila with the Netapp 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::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
+  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
 
 parameter_defaults:
-  ManilaNetappEnableBackend: true
   ManilaNetappBackendName: tripleo_netapp
   ManilaNetappDriverHandlesShareServers: true
   ManilaNetappLogin: ''