openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use netapp_host_type instead of netapp_eseries_host_type"

Browse Source
This commit is contained in:
Jenkins 2016-10-04 11:00:47 +00:00 committed by Gerrit Code Review
commit ccbc75a814
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/cinder-netapp-config.yaml
View File

@ -25,5 +25,5 @@ parameter_defaults:
CinderNetappControllerIps: ''
CinderNetappSaPassword: ''
CinderNetappStoragePools: ''
CinderNetappEseriesHostType: 'linux_dm_mp'
CinderNetappHostType: ''
CinderNetappWebservicePath: '/devmgr/v2'

18
puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
View File

@ -70,12 +70,22 @@ parameters:
CinderNetappStoragePools:
type: string
default: ''
CinderNetappEseriesHostType:
CinderNetappHostType:
type: string
default: 'linux_dm_mp'
default: ''
CinderNetappWebservicePath:
type: string
default: '/devmgr/v2'
# DEPRECATED options for compatibility with older versions
CinderNetappEseriesHostType:
type: string
default: 'linux_dm_mp'
parameter_groups:
- label: deprecated
description: Do not use deprecated params, they will be removed.
parameters:
- CinderNetappEseriesHostType
resources:
CinderNetappConfig:
@ -108,7 +118,7 @@ resources:
cinder::backend::netapp::netapp_controller_ips: {get_input: NetappControllerIps}
cinder::backend::netapp::netapp_sa_password: {get_input: NetappSaPassword}
cinder::backend::netapp::netapp_storage_pools: {get_input: NetappStoragePools}
cinder::backend::netapp::netapp_eseries_host_type: {get_input: NetappEseriesHostType}
cinder::backend::netapp::netapp_host_type: {get_input: NetappHostType}
cinder::backend::netapp::netapp_webservice_path: {get_input: NetappWebservicePath}
CinderNetappDeployment:
@ -139,7 +149,7 @@ resources:
NetappControllerIps: {get_param: CinderNetappControllerIps}
NetappSaPassword: {get_param: CinderNetappSaPassword}
NetappStoragePools: {get_param: CinderNetappStoragePools}
NetappEseriesHostType: {get_param: CinderNetappEseriesHostType}
NetappHostType: {get_param: CinderNetappHostType}
NetappWebservicePath: {get_param: CinderNetappWebservicePath}
outputs: