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
This commit is contained in:
Thomas Herve 2014-05-30 09:52:33 +02:00
parent 1718862503
commit 4e549c3ae6

@ -16,10 +16,10 @@ parameters:
flavor: flavor:
type: string type: string
description: Flavor to use for servers description: Flavor to use for servers
public_net_id: public_net:
type: string type: string
description: > 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: private_net_name:
type: string type: string
description: Name of private network to be created description: Name of private network to be created
@ -54,12 +54,9 @@ resources:
router: router:
type: OS::Neutron::Router type: OS::Neutron::Router
router_gateway:
type: OS::Neutron::RouterGateway
properties: properties:
router_id: { get_resource: router } external_gateway_info:
network_id: { get_param: public_net_id } network: { get_param: public_net }
router_interface: router_interface:
type: OS::Neutron::RouterInterface type: OS::Neutron::RouterInterface
@ -87,7 +84,7 @@ resources:
server1_floating_ip: server1_floating_ip:
type: OS::Neutron::FloatingIP type: OS::Neutron::FloatingIP
properties: properties:
floating_network_id: { get_param: public_net_id } floating_network: { get_param: public_net }
port_id: { get_resource: server1_port } port_id: { get_resource: server1_port }
server2: server2:
@ -110,7 +107,7 @@ resources:
server2_floating_ip: server2_floating_ip:
type: OS::Neutron::FloatingIP type: OS::Neutron::FloatingIP
properties: properties:
floating_network_id: { get_param: public_net_id } floating_network: { get_param: public_net }
port_id: { get_resource: server2_port } port_id: { get_resource: server2_port }
outputs: outputs: