Add allocation-pool support for the public_net
TripleO CI uses 10.0.0.1 statically for the undercloud's public interface. When using extra node in some job's there is sometime a conflict, because the extra node get's the 10.0.0.1 address allocated. Adding support to define the allocation pools on the public_net allows TripleO CI to define a pool with the 10.0.0.1 address eliminated. A good practice would be to set up OVB to use [{start: 10.0.0.128, end: 10.0.0.253}], and then configure the undercloud/overcloud deployed on the OVB infrastructure to use addresses in the range 10.0.0.1-10.0.0.127. The parameter public_net_allocation_pools controls the allocation pool setting, by default all addresses of the subnet is in the pool. Related-Bug: #1874418 Change-Id: Ieca4864e069148abb49eb709bf7f48a14ef04e77
This commit is contained in:
parent
99841adb93
commit
ccec11f9c8
|
@ -61,6 +61,18 @@ parameter_defaults:
|
|||
# Type: string
|
||||
public_net: public
|
||||
|
||||
# Allocation Pools for the public network
|
||||
# Type: comma_delimited_list
|
||||
public_net_allocation_pools: []
|
||||
|
||||
# CIDR for external network subnet
|
||||
# Type: string
|
||||
public_net_cidr: 10.0.0.0/24
|
||||
|
||||
# IP version for the public subnet
|
||||
# Type: number
|
||||
public_net_ip_version: 4
|
||||
|
||||
# Whether this network should be shared across all tenants
|
||||
# Type: boolean
|
||||
public_net_shared: False
|
||||
|
|
|
@ -22,6 +22,9 @@ environments:
|
|||
templates/undercloud-networks.yaml:
|
||||
parameters:
|
||||
- public_net
|
||||
- public_net_cidr
|
||||
- public_net_allocation_pools
|
||||
- public_net_ip_version
|
||||
- public_net_shared
|
||||
- provision_net
|
||||
- provision_net_shared
|
||||
|
|
|
@ -31,6 +31,11 @@ parameters:
|
|||
description: CIDR for external network subnet
|
||||
default: 10.0.0.0/24
|
||||
|
||||
public_net_allocation_pools:
|
||||
type: comma_delimited_list
|
||||
description: Allocation Pools for the public network
|
||||
default: []
|
||||
|
||||
public_subnet_ip_version:
|
||||
type: number
|
||||
description: IP version for the public subnet
|
||||
|
|
|
@ -31,6 +31,11 @@ parameters:
|
|||
description: CIDR for external network subnet
|
||||
default: 10.0.0.0/24
|
||||
|
||||
public_net_allocation_pools:
|
||||
type: comma_delimited_list
|
||||
description: Allocation Pools for the public network
|
||||
default: []
|
||||
|
||||
public_net_router_address:
|
||||
type: string
|
||||
description: Router address for the public network subnet
|
||||
|
@ -78,6 +83,7 @@ resources:
|
|||
network: {get_resource: public_network}
|
||||
name: {get_param: public_net}
|
||||
cidr: {get_param: public_net_cidr}
|
||||
allocation_pools: {get_param: public_net_allocation_pools}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
ip_version: {get_param: public_net_ip_version}
|
||||
|
|
|
@ -86,6 +86,11 @@ parameters:
|
|||
description: CIDR for external network subnet
|
||||
default: 10.0.0.0/24
|
||||
|
||||
public_net_allocation_pools:
|
||||
type: comma_delimited_list
|
||||
description: Allocation Pools for the public network
|
||||
default: []
|
||||
|
||||
public_net_router_address:
|
||||
type: string
|
||||
description: Router address for the public network subnet
|
||||
|
@ -215,6 +220,7 @@ resources:
|
|||
network: {get_resource: public_network}
|
||||
name: {get_param: public_net}
|
||||
cidr: {get_param: public_net_cidr}
|
||||
allocation_pools: {get_param: public_net_allocation_pools}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
ip_version: {get_param: public_net_ip_version}
|
||||
|
|
|
@ -31,6 +31,11 @@ parameters:
|
|||
description: CIDR for external network subnet
|
||||
default: 10.0.0.0/24
|
||||
|
||||
public_net_allocation_pools:
|
||||
type: comma_delimited_list
|
||||
description: Allocation Pools for the public network
|
||||
default: []
|
||||
|
||||
public_net_ip_version:
|
||||
type: number
|
||||
description: IP version for the public subnet
|
||||
|
@ -70,6 +75,7 @@ resources:
|
|||
network: {get_resource: public_network}
|
||||
name: {get_param: public_net}
|
||||
cidr: {get_param: public_net_cidr}
|
||||
allocation_pools: {get_param: public_net_allocation_pools}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
ip_version: {get_param: public_net_ip_version}
|
||||
|
|
Loading…
Reference in New Issue