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-nfs.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-nfs.yaml')
-rw-r--r-- | block-storage-nfs.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index 8b281ddb..49473167 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Block Storage Configuration' parameters: BlockStorageImage: @@ -52,13 +52,13 @@ resources: keystone: host: {get_attr: [controller0, networks, ctlplane, 0]} cinder: - db: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} + db: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} volume_size_mb: '5000' service-password: get_param: CinderPassword include_nfs_backend: 'true' nfs_shares: - - {list_join: ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]} + - {"Fn::Join": ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]} admin-password: {get_param: AdminPassword} rabbit: host: {get_attr: [controller0, networks, ctlplane, 0]} |