Merge "Flexible IP allocations for isolated nets"

5 files changed, 25 insertions, 1 deletions

diff --git a/network/external.yaml b/network/external.yaml
index e9aa5b32..e015dd88 100644
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -33,7 +33,10 @@ parameters:
     default: external_subnet
     description: The name of the external subnet in Neutron.
     type: string
-
+  ExternalAllocationPools:
+    default: [{'start': '10.0.0.4', 'end': '10.0.0.250'}]
+    description: Ip allocation pool range for the external network.
+    type: json
 
 resources:
   ExternalNetwork:
@@ -51,6 +54,7 @@ resources:
       enable_dhcp: {get_param: ExternalNetEnableDHCP}
       name: {get_param: ExternalSubnetName}
       network: {get_resource: ExternalNetwork}
+      allocation_pools: {get_resource: ExternalAllocationPools}
 
 outputs:
   OS::stack_id:
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index 5abfb117..c7e822e9 100644
--- a/network/internal_api.yaml
+++ b/network/internal_api.yaml
@@ -33,6 +33,10 @@ parameters:
     default: internal_api_subnet
     description: The name of the internal API subnet in Neutron.
     type: string
+  InternalApiAllocationPools:
+    default: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
+    description: Ip allocation pool range for the internal API network.
+    type: json
 
 resources:
   InternalApiNetwork:
@@ -50,6 +54,7 @@ resources:
       enable_dhcp: {get_param: InternalApiNetEnableDHCP}
       name: {get_param: InternalApiSubnetName}
       network: {get_resource: InternalApiNetwork}
+      allocation_pools: {get_param: InternalApiAllocationPools}
 
 outputs:
   OS::stack_id:
diff --git a/network/storage.yaml b/network/storage.yaml
index 1f60adf4..d403f9e5 100644
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -33,6 +33,10 @@ parameters:
     default: storage_subnet
     description: The name of the storage subnet in Neutron.
     type: string
+  StorageAllocationPools:
+    default: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
+    description: Ip allocation pool range for the storage network.
+    type: json
 
 resources:
   StorageNetwork:
@@ -50,6 +54,7 @@ resources:
       enable_dhcp: {get_param: StorageNetEnableDHCP}
       name: {get_param: StorageSubnetName}
       network: {get_resource: StorageNetwork}
+      allocation_pools: {get_param: StorageAllocationPools}
 
 outputs:
   OS::stack_id:
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index e97d4364..d0c919b5 100644
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -33,6 +33,10 @@ parameters:
     default: storage_mgmt_subnet
     description: The name of the Storage management subnet in Neutron.
     type: string
+  StorageMgmtAllocationPools:
+    default: [{'start': '172.16.3.4', 'end': '172.16.3.250'}]
+    description: Ip allocation pool range for the storage mgmt network.
+    type: json
 
 resources:
   StorageMgmtNetwork:
@@ -50,6 +54,7 @@ resources:
       enable_dhcp: {get_param: StorageMgmtNetEnableDHCP}
       name: {get_param: StorageMgmtSubnetName}
       network: {get_resource: StorageMgmtNetwork}
+      allocation_pools: {get_param: StorageMgmtAllocationPools}
 
 outputs:
   OS::stack_id:
diff --git a/network/tenant.yaml b/network/tenant.yaml
index db7f99f3..055b87b8 100644
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -33,6 +33,10 @@ parameters:
     default: tenant_subnet
     description: The name of the tenant subnet in Neutron.
     type: string
+  TenantAllocationPools:
+    default: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
+    description: Ip allocation pool range for the tenant network.
+    type: json
 
 resources:
   TenantNetwork:
@@ -50,6 +54,7 @@ resources:
       enable_dhcp: {get_param: TenantNetEnableDHCP}
       name: {get_param: TenantSubnetName}
       network: {get_resource: TenantNetwork}
+      allocation_pools: {get_param: TenantAllocationPools}
 
 outputs:
   OS::stack_id: