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

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 79d5d9f..e24c3a5 100644 (file)
--- 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}
 

diff --git a/swift-storage-puppet.yaml b/swift-storage-puppet.yaml
index c77f667..38183bb 100644 (file)
--- 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

diff --git a/swift-storage.yaml b/swift-storage.yaml
index 38359ff..076d4bc 100644 (file)
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -1,9 +1,6 @@
 heat_template_version: 2014-10-16
 description: 'Common Swift Storage Configuration'
 parameters:
-  ControllerIP:
-    default: ''
-    type: string
   ExtraConfig:
     default: {}
     description: |
@@ -64,12 +61,6 @@ parameters:
     default: 'false'
     description: Value of mount_check in Swift account/container/object -server.conf
     type: boolean
-  NeutronEnableTunnelling:
-    default: "True"
-    type: string
-  NeutronNetworkType:
-    default: gre
-    type: string
   MinPartHours:
     type: number
     default: 1
@@ -78,12 +69,6 @@ parameters:
     default: 10
     description: Partition Power to use when building Swift rings
     type: number
-  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
@@ -114,10 +99,7 @@ resources:
           min-part-hours: { get_input: swift_min_part_hours }
           mount-check: { get_input: swift_mount_check }
           replicas: {get_input: swift_replicas }
-          service-password: { get_input: swift_password }
         neutron:
-          enable_tunnelling: {get_param: NeutronEnableTunnelling}
-          tenant_network_type: {get_param: NeutronNetworkType}
           ovs:
             local_ip: { get_input: neutron_local_ip }
   SwiftStorage:
@@ -129,20 +111,6 @@ resources:
       user_data_format: SOFTWARE_CONFIG
       networks:
         - network: ctlplane
-  SwiftKeystoneConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      config:
-        keystone:
-          host: {get_input: keystone_host}
-  SwiftStorageKeystone:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      server: {get_resource: SwiftStorage}
-      config: {get_resource: SwiftKeystoneConfig}
-      signal_transport: NO_SIGNAL
-      input_values:
-        keystone_host: {get_param: ControllerIP}
   SwiftStorageDeploy:
     type: OS::Heat::StructuredDeployment
     properties:
@@ -155,7 +123,6 @@ resources:
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
         swift_hash_suffix: {get_param: HashSuffix}
         swift_mount_check: {get_param: MountCheck}
-        swift_password: {get_param: Password}
         swift_min_part_hours: {get_param: MinPartHours}
         swift_part_power: {get_param: PartPower}
         swift_replicas: { get_param: Replicas}