summaryrefslogtreecommitdiffstats
path: root/puppet/extraconfig/pre_deploy/controller
diff options
context:
space:
mode:
authorRyan Hefner <ryan.hefner@netapp.com>2015-06-18 17:37:31 -0400
committerRyan Hefner <ryan.hefner@netapp.com>2015-07-20 11:09:44 -0400
commite284daa1ff9a21984a640a64a011aa709b99c5b9 (patch)
tree39560f4620d0ee6859223ac16007898336ccb0d0 /puppet/extraconfig/pre_deploy/controller
parent82f04ec310fe9d4f99e46077bb1c6e439187c7ed (diff)
Fix Puppet Configuring NetApp Cinder Backend
It was incorrectly assumed that Puppet variables assigned to a defined class (as seen in cinder-netapp.yaml) would be applied to any resources created with that type. This is not how Puppet works. The full range of configuration parameters to cinder::backend::netapp have been added back in. They are still pulling from Hiera like they were intended before, but it needs to be a little more explicit for Puppet to be happy. Change-Id: I2e00eae829713b2dbb1e4a5f296b6d08d0c21100
Diffstat (limited to 'puppet/extraconfig/pre_deploy/controller')
-rw-r--r--puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index 1d982dff..18295a2f 100644
--- 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'
@@ -89,7 +89,7 @@ resources:
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}