diff options
author | Dan Prince <dprince@redhat.com> | 2015-01-10 21:44:27 -0500 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-01-27 09:07:19 -0500 |
commit | af061f09c68e11ca03a9b63c7183a52782d6cc10 (patch) | |
tree | 8acd82f1e1a3764178acc681fe16edf94d1ee1d4 /overcloud-without-mergepy.yaml | |
parent | e6a88fcc66e1f19a50caa81b3171e74f03756f2e (diff) |
Remove unused swift params from -without-mergepy
In doing the Puppet version of the Swift role I noticed
4 parameters which we apply to storage nodes which should
not be required. This patch drops the following parameters
from the swift-storage and swift-storage-puppet nested
stacks which should not be required.
1) ControllerIP: There is no reason a storage node should need
the IP address of the controller. The swift proxy would need
this information in order to be able to contact keystone.
This swift-proxy is not installed on storage nodes so we can
drop the parameter here.
2) NeutronEnableTunnelling: There is no reason for Neutron
to be installed on Swift storage nodes. No need to create
an OVS bridge either.
3) NeutronNetworkType: Similar to above. No neutron requirements
exist here so this parameter is not required.
4) Password: This only applies to the the swift-proxy which is
currently part of our controller role. Storage nodes shouldn't need
the keystone service-password for any reason.
Change-Id: Icbf05363475c388fc722277da3d3d00a7355b19a
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 79d5d9fa..e24c3a57 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -621,16 +621,12 @@ resources: resource_def: type: OS::TripleO::ObjectStorage properties: - ControllerIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} KeyName: {get_param: KeyName} - NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} - NeutronNetworkType: {get_param: NeutronNetworkType} Flavor: {get_param: OvercloudSwiftStorageFlavor} HashSuffix: {get_param: SwiftHashSuffix} MountCheck: {get_param: SwiftMountCheck} MinPartHours: {get_param: SwiftMinPartHours} PartPower: {get_param: SwiftPartPower} - Password: {get_param: SwiftPassword} Image: {get_param: SwiftStorageImage} Replicas: { get_param: SwiftReplicas} |