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 /controller.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 'controller.yaml')
| -rw-r--r-- | controller.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/controller.yaml b/controller.yaml index 1b0cb541..8aac819f 100644 --- a/controller.yaml +++ b/controller.yaml @@ -1,6 +1,6 @@ description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL server,Dedicated RabbitMQ Server -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 parameters: AdminToken: type: string @@ -130,7 +130,7 @@ resources: password: {get_param: NeutronDBPassword} glance: db: - list_join: + Fn::Join: - '' - - 'mysql://glance:' - {get_param: GlanceDBPassword} @@ -141,7 +141,7 @@ resources: get_param: GlanceLogFile heat: db: - list_join: + Fn::Join: - '' - - 'mysql://heat:' - {get_param: HeatDBPassword} @@ -168,14 +168,14 @@ resources: host: '127.0.0.1' db: - list_join: + Fn::Join: - '' - - 'mysql://keystone:' - {get_param: KeystoneDBPassword} - '@127.0.0.1/keystone' nova: db: - list_join: + Fn::Join: - '' - - 'mysql://nova:' - {get_param: NovaDBPassword} @@ -184,7 +184,7 @@ resources: host: '127.0.0.1' ovs_db: - list_join: + Fn::Join: - '' - - 'mysql://neutron:' - {get_param: NeutronDBPassword} |