Merge "Parametrize and increase default of swift-proxy node_timeout"

[apex-tripleo-heat-templates.git] / puppet / extraconfig / pre_deploy / controller / cinder-netapp.yaml

diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index 1d982df..6ff9088 100644 (file)
--- a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
@@ -9,8 +9,8 @@ parameters:
 
   # Config specific parameters, to be provided via parameter_defaults
   CinderEnableNetappBackend:
-    type: string
-    default: false
+    type: boolean
+    default: true
   CinderNetappBackendName:
     type: string
     default: 'tripleo_netapp'
@@ -18,6 +18,7 @@ parameters:
     type: string
   CinderNetappPassword:
     type: string
+    hidden: true
   CinderNetappServerHostname:
     type: string
   CinderNetappServerPort:
@@ -65,6 +66,7 @@ parameters:
   CinderNetappSaPassword:
     type: string
     default: ''
+    hidden: true
   CinderNetappStoragePools:
     type: string
     default: ''
@@ -85,11 +87,11 @@ resources:
           datafiles:
             cinder_netapp_data:
               mapped_data:
-                cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
+                tripleo::profile::base::cinder::volume::cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
                 cinder::backend::netapp::title: {get_input: NetappBackendName}
                 cinder::backend::netapp::netapp_login: {get_input: NetappLogin}
                 cinder::backend::netapp::netapp_password: {get_input: NetappPassword}
-                cinder::backend::netapp::netapp_hostname: {get_input: NetappServerHostname}
+                cinder::backend::netapp::netapp_server_hostname: {get_input: NetappServerHostname}
                 cinder::backend::netapp::netapp_server_port: {get_input: NetappServerPort}
                 cinder::backend::netapp::netapp_size_multiplier: {get_input: NetappSizeMultiplier}
                 cinder::backend::netapp::netapp_storage_family: {get_input: NetappStorageFamily}
@@ -112,6 +114,7 @@ resources:
   CinderNetappDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: CinderNetappDeployment
       config: {get_resource: CinderNetappConfig}
       server: {get_param: server}
       input_values: