diff options
Diffstat (limited to 'swift-storage-source.yaml')
| -rw-r--r-- | swift-storage-source.yaml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index d6539663..3dbdda95 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Swift Storage Configuration' parameters: SwiftStorageImage: @@ -35,7 +35,7 @@ resources: config: {get_resource: SwiftKeystoneConfig} signal_transport: NO_SIGNAL input_values: - keystone_host: {get_attr: [controller0, networks, ctlplane, 0]} + keystone_host: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} SwiftStorage0Deploy: type: OS::Heat::StructuredDeployment properties: @@ -44,32 +44,34 @@ resources: 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_devices: - list_join: + Fn::Join: - ', ' - Merge::Map: controller0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [controller0, networks, ctlplane, 0]} - ':%PORT%/d1' SwiftStorage0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - ':%PORT%/d1' swift_proxy_memcache: - list_join: + Fn::Join: - ',' - Merge::Map: controller0: - list_join: + Fn::Join: - ', ' - - - list_join: + - - Fn::Join: - '' - - {get_attr: [controller0, networks, ctlplane, 0]} - ':11211' |