X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fcinder-netapp-config.yaml;h=b9a843428e8df6bfc295a5409e648bfc2204f141;hb=afdc138987db8246be1f3a0948967f10c3011bb8;hp=4dd9eed7915c8ea7709aec76a7062602916c68c0;hpb=cac21c27aa11dd2c5c6b178ab8d16eadf5483760;p=apex-tripleo-heat-templates.git

diff --git a/environments/cinder-netapp-config.yaml b/environments/cinder-netapp-config.yaml
index 4dd9eed7..b9a84342 100644
--- a/environments/cinder-netapp-config.yaml
+++ b/environments/cinder-netapp-config.yaml
@@ -1,30 +1,29 @@
 # A Heat environment file which can be used to enable a
-# a Cinder NetApp backend.
+# a Cinder NetApp backend, configured via puppet
 resource_registry:
-  OS::TripleO::Controller::CinderBackend: extraconfig/controller/cinder-netapp.yaml
+  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
 
 parameter_defaults:
-  CinderBackendConfig:
-    CinderEnableNetappBackend: false
-    CinderNetappBackendName: 'tripleo_netapp'
-    CinderNetappLogin: ''
-    CinderNetappPassword: ''
-    CinderNetappServerHostname: ''
-    CinderNetappServerPort: '80'
-    CinderNetappSizeMultiplier: '1.2'
-    CinderNetappStorageFamily: 'ontap_cluster'
-    CinderNetappStorageProtocol: 'nfs'
-    CinderNetappTransportType: 'http'
-    CinderNetappVfiler: ''
-    CinderNetappVolumeList: ''
-    CinderNetappVserver: ''
-    CinderNetappPartnerBackendName: ''
-    CinderNetappNfsShares: ''
-    CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf'
-    CinderNetappNfsMountOptions: ''
-    CinderNetappCopyOffloadToolPath: ''
-    CinderNetappControllerIps: ''
-    CinderNetappSaPassword: ''
-    CinderNetappStoragePools: ''
-    CinderNetappEseriesHostType: 'linux_dm_mp'
-    CinderNetappWebservicePath: '/devmgr/v2'
+  CinderEnableNetappBackend: true
+  CinderNetappBackendName: 'tripleo_netapp'
+  CinderNetappLogin: ''
+  CinderNetappPassword: ''
+  CinderNetappServerHostname: ''
+  CinderNetappServerPort: '80'
+  CinderNetappSizeMultiplier: '1.2'
+  CinderNetappStorageFamily: 'ontap_cluster'
+  CinderNetappStorageProtocol: 'nfs'
+  CinderNetappTransportType: 'http'
+  CinderNetappVfiler: ''
+  CinderNetappVolumeList: ''
+  CinderNetappVserver: ''
+  CinderNetappPartnerBackendName: ''
+  CinderNetappNfsShares: ''
+  CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf'
+  CinderNetappNfsMountOptions: ''
+  CinderNetappCopyOffloadToolPath: ''
+  CinderNetappControllerIps: ''
+  CinderNetappSaPassword: ''
+  CinderNetappStoragePools: ''
+  CinderNetappHostType: ''
+  CinderNetappWebservicePath: '/devmgr/v2'