Merge "Add allocation-pool support for the public_net"

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

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

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

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}

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}

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}