Add gateway_ip in OS::Neutron::Subnet

This patch allows to :
  - disable the gateway ip for non routable network
  - use the first ip in the subnet
  - set the correct gateway on the external network

Change-Id: Idc816c782856e93ecd339b3aca2a7f53c1564b1d
Closes-bug: #1588379
Depends-On: I8ea6733fe46902e1baeff4ccfbcd42ecc5a1825f
This commit is contained in:
Dimitri Savineau 2016-06-02 09:55:11 -04:00
parent bcbb89a921
commit 1fa4c02fc3
11 changed files with 24 additions and 1 deletions

View File

@ -37,6 +37,10 @@ parameters:
default: [{'start': '10.0.0.4', 'end': '10.0.0.250'}]
description: Ip allocation pool range for the external network.
type: json
ExternalInterfaceDefaultRoute:
default: '10.0.0.1'
description: default route for the external network
type: string
resources:
ExternalNetwork:
@ -55,6 +59,7 @@ resources:
name: {get_param: ExternalSubnetName}
network: {get_resource: ExternalNetwork}
allocation_pools: {get_param: ExternalAllocationPools}
gateway_ip: {get_param: ExternalInterfaceDefaultRoute}
outputs:
OS::stack_id:

View File

@ -42,6 +42,10 @@ parameters:
default: dhcpv6-stateful
description: Neutron subnet IPv6 router advertisement mode
type: string
ExternalInterfaceDefaultRoute:
default: '2001:db8:fd00:1000::1'
description: default route for the external network
type: string
resources:
ExternalNetwork:
@ -62,6 +66,7 @@ resources:
name: {get_param: ExternalSubnetName}
network: {get_resource: ExternalNetwork}
allocation_pools: {get_param: ExternalAllocationPools}
gateway_ip: {get_param: ExternalInterfaceDefaultRoute}
outputs:
OS::stack_id:

View File

@ -55,6 +55,7 @@ resources:
name: {get_param: InternalApiSubnetName}
network: {get_resource: InternalApiNetwork}
allocation_pools: {get_param: InternalApiAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -62,6 +62,7 @@ resources:
name: {get_param: InternalApiSubnetName}
network: {get_resource: InternalApiNetwork}
allocation_pools: {get_param: InternalApiAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -38,6 +38,10 @@ parameters:
default: [{'start': '10.0.1.4', 'end': '10.0.1.250'}]
description: Ip allocation pool range for the management network.
type: json
ManagementInterfaceDefaultRoute:
default: null
description: The default route of the management network.
type: string
resources:
ManagementNetwork:
@ -56,6 +60,7 @@ resources:
name: {get_param: ManagementSubnetName}
network: {get_resource: ManagementNetwork}
allocation_pools: {get_param: ManagementAllocationPools}
gateway_ip: {get_param: ManagementInterfaceDefaultRoute}
outputs:
OS::stack_id:

View File

@ -55,6 +55,7 @@ resources:
name: {get_param: StorageSubnetName}
network: {get_resource: StorageNetwork}
allocation_pools: {get_param: StorageAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -55,6 +55,7 @@ resources:
name: {get_param: StorageMgmtSubnetName}
network: {get_resource: StorageMgmtNetwork}
allocation_pools: {get_param: StorageMgmtAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -62,6 +62,7 @@ resources:
name: {get_param: StorageMgmtSubnetName}
network: {get_resource: StorageMgmtNetwork}
allocation_pools: {get_param: StorageMgmtAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -62,6 +62,7 @@ resources:
name: {get_param: StorageSubnetName}
network: {get_resource: StorageNetwork}
allocation_pools: {get_param: StorageAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -55,6 +55,7 @@ resources:
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
allocation_pools: {get_param: TenantAllocationPools}
gateway_ip: null
outputs:
OS::stack_id:

View File

@ -62,6 +62,7 @@ resources:
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
allocation_pools: {get_param: TenantAllocationPools}
gateway_ip: null
outputs:
OS::stack_id: