Remove unused cinder params from -without-mergepy

Cinder block storage nodes shouldn't need to know the
AdminPassword and CinderPassword values. There are
no services which require Keystone related passwords
on the block storage nodes.

Change-Id: I4aa89347c60ec6258bd66725a895f6fd2b4844f6
This commit is contained in:
Dan Prince 2015-01-20 08:49:53 -05:00
parent 8633aca4ed
commit 0fce77e3c2
3 changed files with 0 additions and 23 deletions

View File

@ -1,10 +1,6 @@
heat_template_version: 2014-10-16
description: 'Block Storage Configuration w/ Puppet'
parameters:
#FIXME: this should not be required
AdminPassword:
default: ''
type: string
Image:
default: overcloud-cinder-volume
type: string
@ -16,12 +12,6 @@ parameters:
default: 5000
description: The size of the loopback file used by the cinder LVM driver.
type: number
# FIXME: this should not be required
CinderPassword:
default: unset
description: The password for the cinder service account, used by cinder-api.
hidden: true
type: string
VirtualIP:
default: ''
type: string

View File

@ -1,9 +1,6 @@
heat_template_version: 2014-10-16
description: 'Common Block Storage Configuration'
parameters:
AdminPassword:
default: ''
type: string
Image:
default: overcloud-cinder-volume
type: string
@ -15,11 +12,6 @@ parameters:
default: 5000
description: The size of the loopback file used by the cinder LVM driver.
type: number
CinderPassword:
default: unset
description: The password for the cinder service account, used by cinder-api.
hidden: true
type: string
VirtualIP:
default: ''
type: string
@ -116,15 +108,12 @@ resources:
properties:
group: os-apply-config
config:
admin-password: {get_param: AdminPassword}
keystone:
host: {get_input: controller_virtual_ip}
cinder:
db: {get_input: cinder_dsn}
volume_size_mb:
get_param: CinderLVMLoopDeviceSize
service-password:
get_param: CinderPassword
iscsi-helper:
get_param: CinderISCSIHelper
snmpd:

View File

@ -603,11 +603,9 @@ resources:
resource_def:
type: OS::TripleO::BlockStorage
properties:
AdminPassword: {get_param: AdminPassword}
Image: {get_param: BlockStorageImage}
CinderISCSIHelper: {get_param: CinderISCSIHelper}
CinderLVMLoopDeviceSize: {get_param: CinderLVMLoopDeviceSize}
CinderPassword: {get_param: CinderPassword}
VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudBlockStorageFlavor}