summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-01-20 08:49:53 -0500
committerDan Prince <dprince@redhat.com>2015-01-27 09:07:19 -0500
commit0fce77e3c2169a05d84ee6e7b76fe651429aa380 (patch)
treeb72e2f1bef557bee93393bd05bef10b95082bb39
parent8633aca4ed5461b5758866f5b64fdaf9957ae151 (diff)
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
-rw-r--r--cinder-storage-puppet.yaml10
-rw-r--r--cinder-storage.yaml11
-rw-r--r--overcloud-without-mergepy.yaml2
3 files changed, 0 insertions, 23 deletions
diff --git a/cinder-storage-puppet.yaml b/cinder-storage-puppet.yaml
index c1cbffb0..31dae229 100644
--- a/cinder-storage-puppet.yaml
+++ b/cinder-storage-puppet.yaml
@@ -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
diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index b30dcdb6..0f122238 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -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:
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 80fd2024..329f2224 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -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}