Merge "Fix incorrect heat template syntax"

This commit is contained in:
Jenkins 2015-04-08 05:58:41 +00:00 committed by Gerrit Code Review
commit 01f578f34d
3 changed files with 6 additions and 6 deletions

View File

@ -171,8 +171,8 @@ floating IP to the instance:
association:
type: OS::Nova::FloatingIPAssociation
properties:
- floating_ip: { get_resource: floating_ip }
- server_id: { get_resource: instance }
floating_ip: { get_resource: floating_ip }
server_id: { get_resource: instance }
OS::Neutron resources
~~~~~~~~~~~~~~~~~~~~~

View File

@ -152,8 +152,8 @@ floating IP to the instance:</para>
association:
type: OS::Nova::FloatingIPAssociation
properties:
- floating_ip: { get_resource: floating_ip }
- server_id: { get_resource: instance }</programlisting>
floating_ip: { get_resource: floating_ip }
server_id: { get_resource: instance }</programlisting>
</section>
<section xml:id="os-neutron-resources">
<title>OS::Neutron resources</title>

View File

@ -175,8 +175,8 @@ floating IP to the instance:
association:
type: OS::Nova::FloatingIPAssociation
properties:
- floating_ip: { get_resource: floating_ip }
- server_id: { get_resource: instance }
floating_ip: { get_resource: floating_ip }
server_id: { get_resource: instance }
OS::Neutron resources
+++++++++++++++++++++