diff --git a/environments/base.yaml b/environments/base.yaml index 632d000..172aa95 100644 --- a/environments/base.yaml +++ b/environments/base.yaml @@ -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 diff --git a/sample-env-generator/environments.yaml b/sample-env-generator/environments.yaml index 633862a..f2c95bf 100644 --- a/sample-env-generator/environments.yaml +++ b/sample-env-generator/environments.yaml @@ -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 diff --git a/templates/undercloud-networks-existing.yaml b/templates/undercloud-networks-existing.yaml index 2cf6898..c7c4f8f 100644 --- a/templates/undercloud-networks-existing.yaml +++ b/templates/undercloud-networks-existing.yaml @@ -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 diff --git a/templates/undercloud-networks-public-router.yaml b/templates/undercloud-networks-public-router.yaml index 19bc049..67dc007 100644 --- a/templates/undercloud-networks-public-router.yaml +++ b/templates/undercloud-networks-public-router.yaml @@ -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} diff --git a/templates/undercloud-networks-routed.yaml b/templates/undercloud-networks-routed.yaml index c04370b..c49eadb 100644 --- a/templates/undercloud-networks-routed.yaml +++ b/templates/undercloud-networks-routed.yaml @@ -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} diff --git a/templates/undercloud-networks.yaml b/templates/undercloud-networks.yaml index 1adc322..ff5829e 100644 --- a/templates/undercloud-networks.yaml +++ b/templates/undercloud-networks.yaml @@ -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}