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 /swift-storage-puppet.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 'swift-storage-puppet.yaml')
| -rw-r--r-- | swift-storage-puppet.yaml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/swift-storage-puppet.yaml b/swift-storage-puppet.yaml index c77f667f..38183bba 100644 --- a/swift-storage-puppet.yaml +++ b/swift-storage-puppet.yaml @@ -1,10 +1,6 @@ heat_template_version: 2014-10-16 description: 'Common Swift Storage Configuration' parameters: - #FIXME: this should not be required. - ControllerIP: - default: '' - type: string Flavor: description: Flavor for Swift storage nodes to request when deploying. type: string @@ -27,14 +23,6 @@ parameters: default: 'false' description: Value of mount_check in Swift account/container/object -server.conf type: boolean - #FIXME: this is is not required. Leaving here for compatability with the overcloud template. - NeutronEnableTunnelling: - default: "True" - type: string - #FIXME: this is is not required. Leaving here for compatability with the overcloud template. - NeutronNetworkType: - default: gre - type: string MinPartHours: type: number default: 1 @@ -43,13 +31,6 @@ parameters: default: 10 description: Partition Power to use when building Swift rings type: number - #FIXME: this is is not required. Leaving here for compatability with the overcloud template. - Password: - default: unset - description: The password for the swift service account, used by the swift proxy - services. - hidden: true - type: string Replicas: type: number default: 1 |