Merge "Parametrize Swift partition power"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Sep 2014 09:15:26 +0000 (09:15 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Sep 2014 09:15:26 +0000 (09:15 +0000)
1  2 
swift-source.yaml
swift-storage-source.yaml

Simple merge
@@@ -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:
            - ', '