Browse Source

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
changes/41/324541/2
Dimitri Savineau 6 years ago
parent
commit
1fa4c02fc3
  1. 5
      network/external.yaml
  2. 5
      network/external_v6.yaml
  3. 1
      network/internal_api.yaml
  4. 1
      network/internal_api_v6.yaml
  5. 7
      network/management.yaml
  6. 1
      network/storage.yaml
  7. 1
      network/storage_mgmt.yaml
  8. 1
      network/storage_mgmt_v6.yaml
  9. 1
      network/storage_v6.yaml
  10. 1
      network/tenant.yaml
  11. 1
      network/tenant_v6.yaml

5
network/external.yaml

@ -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:

5
network/external_v6.yaml

@ -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:

1
network/internal_api.yaml

@ -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:

1
network/internal_api_v6.yaml

@ -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:

7
network/management.yaml

@ -13,7 +13,7 @@ parameters:
ManagementNetValueSpecs:
default: {'provider:physical_network': 'management', 'provider:network_type': 'flat'}
description: Value specs for the management network.
type: json
type: json
ManagementNetAdminStateUp:
default: false
description: The admin state of the network.
@ -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:

1
network/storage.yaml

@ -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:

1
network/storage_mgmt.yaml

@ -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:

1
network/storage_mgmt_v6.yaml

@ -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:

1
network/storage_v6.yaml

@ -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:

1
network/tenant.yaml

@ -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:

1
network/tenant_v6.yaml

@ -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:

Loading…
Cancel
Save