diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-08-11 09:18:01 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-13 10:53:46 +1200 |
| commit | 8a99e7d461f211f43751d5c72c8dbc5d1ae05ead (patch) | |
| tree | d6501865d4dedeb5019cec00db64c3fd9ead7076 /block-storage.yaml | |
| parent | a569866c31d698f651612c0dbbe2de8ae7f73708 (diff) | |
Switch to heat_template_version: 2013-05-23
To support underclouds and seeds running older than the very
latest heat.
2013-05-23 lacks function list_join, so this change reverts to
using the equivalent function Fn::Join.
Change-Id: I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08
Closes-Bug: #1354305
Diffstat (limited to 'block-storage.yaml')
| -rw-r--r-- | block-storage.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index bf539e2b..22811d37 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Block Storage Configuration' parameters: BlockStorageImage: @@ -30,7 +30,7 @@ resources: config: {get_resource: BlockStorageConfig} input_values: controller_host: {get_attr: [controller0, networks, ctlplane, 0]} - cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} + cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]} signal_transport: NO_SIGNAL BlockStorageConfig: |