diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-08 15:31:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-08 15:31:29 +0000 |
| commit | 33db97ccf9e44a43ace9f2259504f993ee2e812b (patch) | |
| tree | b86fc87ab8621087b404db841d7e3f2d9d716e2b /puppet/controller-puppet.yaml | |
| parent | fa477ef3807a373b175c4a1218c5507755f46f57 (diff) | |
| parent | cac21c27aa11dd2c5c6b178ab8d16eadf5483760 (diff) | |
Merge "Enable NetApp Backends in Cinder"
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 98c8f5db..e3a07f36 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -49,6 +49,11 @@ parameters: description: The password for the cinder service and db account, used by cinder-api. type: string hidden: true + CinderBackendConfig: + default: {} + description: Contains parameters to configure Cinder backends. Typically + set via parameter_defaults in the resource registry. + type: json CloudName: default: '' description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org @@ -570,6 +575,7 @@ resources: cinder_password: {get_param: CinderPassword} cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend} cinder_iscsi_helper: {get_param: CinderISCSIHelper} + cinder_backend_config: {get_param: CinderBackendConfig} cinder_dsn: list_join: - '' @@ -824,6 +830,7 @@ resources: cinder::debug: {get_input: debug} cinder_enable_iscsi_backend: {get_input: cinder_enable_iscsi_backend} cinder::glance::glance_api_servers: {get_input: glance_api_servers} + cinder_backend_config: {get_input: CinderBackendConfig} # Glance glance::api::bind_port: {get_input: glance_port} |