From 9aad27b3ad0cb07925ea5a7e9be3e824bdfb3f0c Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Fri, 29 Jun 2018 13:48:58 -0400 Subject: [PATCH] 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 (cherry picked from commit d989c01ce4a5e24cce54ddf206db67634396a00e) (cherry picked from commit 78fa70ca7a20d3df557cb910189a7fc0ae3019c8) --- environments/cinder-netapp-config.yaml | 4 ---- environments/storage/cinder-netapp-config.yaml | 2 +- sample-env-generator/storage.yaml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/environments/cinder-netapp-config.yaml b/environments/cinder-netapp-config.yaml index 83ecbbe41c..dfd1589395 100644 --- 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 index c118fe7b47..36568458d9 100644 --- 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 index ec0d070e37..007c53afa3 100644 --- a/sample-env-generator/storage.yaml +++ b/sample-env-generator/storage.yaml @@ -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