From 4e549c3ae607917f374073557a132e636cf409a6 Mon Sep 17 00:00:00 2001 From: Thomas Herve <thomas.herve@enovance.com> Date: Fri, 30 May 2014 09:52:33 +0200 Subject: [PATCH] Update hot neutron example Update the HOT neutron example template to remove usage of RouterGateway and use the floating_network property of FloatingIP. Change-Id: Id72967a87a4894909b71b224759eed9d75053aed --- hot/servers_in_new_neutron_net.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hot/servers_in_new_neutron_net.yaml b/hot/servers_in_new_neutron_net.yaml index 84a309d2..e41f6a8f 100644 --- a/hot/servers_in_new_neutron_net.yaml +++ b/hot/servers_in_new_neutron_net.yaml @@ -16,10 +16,10 @@ parameters: flavor: type: string description: Flavor to use for servers - public_net_id: + public_net: type: string description: > - ID of public network for which floating IP addresses will be allocated + ID or name of public network for which floating IP addresses will be allocated private_net_name: type: string description: Name of private network to be created @@ -54,12 +54,9 @@ resources: router: type: OS::Neutron::Router - - router_gateway: - type: OS::Neutron::RouterGateway properties: - router_id: { get_resource: router } - network_id: { get_param: public_net_id } + external_gateway_info: + network: { get_param: public_net } router_interface: type: OS::Neutron::RouterInterface @@ -87,7 +84,7 @@ resources: server1_floating_ip: type: OS::Neutron::FloatingIP properties: - floating_network_id: { get_param: public_net_id } + floating_network: { get_param: public_net } port_id: { get_resource: server1_port } server2: @@ -110,7 +107,7 @@ resources: server2_floating_ip: type: OS::Neutron::FloatingIP properties: - floating_network_id: { get_param: public_net_id } + floating_network: { get_param: public_net } port_id: { get_resource: server2_port } outputs: