openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Clean up env files for Cinder's Netapp backend" into stable/pike

This commit is contained in:
Zuul 2018-08-03 15:55:16 +00:00 committed by Gerrit Code Review
parent 223ff78050 9aad27b3ad
commit 541a525924
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/cinder-netapp-config.yaml
View File

@ -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
View File

@ -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
View File

@ -136,4 +136,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