From: Jenkins Date: Tue, 16 Sep 2014 09:15:26 +0000 (+0000) Subject: Merge "Parametrize Swift partition power" X-Git-Tag: opnfv-6.0.0~2744 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=622d4cb6cf92704f7cbdd8683dd5c4d406646ce5;p=apex-tripleo-heat-templates.git Merge "Parametrize Swift partition power" --- 622d4cb6cf92704f7cbdd8683dd5c4d406646ce5 diff --cc swift-storage-source.yaml index 103a7ec7,49bc3e42..48154e23 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@@ -41,8 -47,12 +41,9 @@@ resources config: {get_resource: SwiftConfig} signal_transport: NO_SIGNAL input_values: - neutron_local_ip: {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - neutron_tenant_network_type: {get_param: NeutronNetworkType} - neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} + swift_part_power: {get_param: SwiftPartPower} swift_devices: Fn::Join: - ', '