Merge "Clean up env files for Cinder's Netapp backend"

openstack-archive · Jul 14, 2018 · 7ca6037 · 7ca6037
2 parents e120a5e + d989c01
commit 7ca6037
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/environments/cinder-netapp-config.yaml b/environments/cinder-netapp-config.yaml
@@ -1,7 +1,3 @@
-# *************************************************************************************
-# DEPRECATED: Use tripleo-heat-templates/environments/storage/cinder-netapp-config.yaml
-# instead.
-# *************************************************************************************
 # A Heat environment file which can be used to enable a
 # a Cinder NetApp backend, configured via puppet
 resource_registry:

diff --git a/environments/storage/cinder-netapp-config.yaml b/environments/storage/cinder-netapp-config.yaml
@@ -124,4 +124,4 @@ parameter_defaults:
   # End static parameters
   # *********************
 resource_registry:
-  OS::TripleO::ControllerExtraConfigPre: ../../puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+  OS::TripleO::Services::CinderBackendNetApp: ../puppet/services/cinder-backend-netapp.yaml
diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml
@@ -68,4 +68,4 @@ environments:
     static:
       - CinderEnableNetappBackend
     resource_registry:
-      OS::TripleO::ControllerExtraConfigPre: ../../puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+      OS::TripleO::Services::CinderBackendNetApp: ../puppet/services/cinder-backend-netapp.yaml