Browse Source

Clean up env files for Cinder's Netapp backend

Remove the misleading comment from the cinder-netapp-config.yaml file in
the environments directory that claimed the file is deprecated in favor
of the 'sample-env-generator' file in the environments/storage directory.
The sample-env-generator has not been widely adopted, and the Netapp
file in the environments directory is still being maintained.

Update the sample-env-generator files so they specify the
OS::TripleO::Services::CinderBackendNetApp composable service.

Closes-Bug: 1779397
Change-Id: If0343e96700bf13c0d49c3ae3c311ada1c26a0c0
changes/37/579237/1
Alan Bishop 4 years ago
parent
commit
d989c01ce4
  1. 4
      environments/cinder-netapp-config.yaml
  2. 2
      environments/storage/cinder-netapp-config.yaml
  3. 2
      sample-env-generator/storage.yaml

4
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:

2
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

2
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

Loading…
Cancel
Save