Merge "Add gateway_ip in OS::Neutron::Subnet"

11 files changed, 24 insertions, 1 deletions

diff --git a/network/external.yaml b/network/external.yaml
index 3b24da7e..4dfbc77e 100644
--- a/network/external.yaml
+++ b/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:
diff --git a/network/external_v6.yaml b/network/external_v6.yaml
index 3e120f24..e0736ab7 100644
--- a/network/external_v6.yaml
+++ b/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:
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index 6f8aa3a8..090e38f7 100644
--- a/network/internal_api.yaml
+++ b/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:
diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml
index 68c14fbe..19d64b0a 100644
--- a/network/internal_api_v6.yaml
+++ b/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:
diff --git a/network/management.yaml b/network/management.yaml
index 6878bac4..6798e11e 100644
--- a/network/management.yaml
+++ b/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:
diff --git a/network/storage.yaml b/network/storage.yaml
index dc9f35ea..35dae17a 100644
--- a/network/storage.yaml
+++ b/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:
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index 59933c8c..03cfd139 100644
--- a/network/storage_mgmt.yaml
+++ b/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:
diff --git a/network/storage_mgmt_v6.yaml b/network/storage_mgmt_v6.yaml
index f05644ef..39c456db 100644
--- a/network/storage_mgmt_v6.yaml
+++ b/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:
diff --git a/network/storage_v6.yaml b/network/storage_v6.yaml
index 36a6fae8..5c8af9e5 100644
--- a/network/storage_v6.yaml
+++ b/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:
diff --git a/network/tenant.yaml b/network/tenant.yaml
index 6fe96121..1045b81b 100644
--- a/network/tenant.yaml
+++ b/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:
diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml
index b653eaf7..bf758a50 100644
--- a/network/tenant_v6.yaml
+++ b/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: