...
|
...
|
@@ -63,14 +63,14 @@ IPV6_ADDRESS_MODE=${IPV6_ADDRESS_MODE:-slaac}
|
63
|
63
|
IPV6_PUBLIC_SUBNET_NAME=${IPV6_PUBLIC_SUBNET_NAME:-ipv6-public-subnet}
|
64
|
64
|
IPV6_PRIVATE_SUBNET_NAME=${IPV6_PRIVATE_SUBNET_NAME:-ipv6-private-subnet}
|
65
|
65
|
FIXED_RANGE_V6=${FIXED_RANGE_V6:-fd$IPV6_GLOBAL_ID::/64}
|
66
|
|
-IPV6_PRIVATE_NETWORK_GATEWAY=${IPV6_PRIVATE_NETWORK_GATEWAY:-fd$IPV6_GLOBAL_ID::1}
|
|
66
|
+IPV6_PRIVATE_NETWORK_GATEWAY=${IPV6_PRIVATE_NETWORK_GATEWAY:-}
|
67
|
67
|
IPV6_PUBLIC_RANGE=${IPV6_PUBLIC_RANGE:-2001:db8::/64}
|
68
|
68
|
IPV6_PUBLIC_NETWORK_GATEWAY=${IPV6_PUBLIC_NETWORK_GATEWAY:-2001:db8::2}
|
69
|
69
|
IPV6_ROUTER_GW_IP=${IPV6_ROUTER_GW_IP:-2001:db8::1}
|
70
|
70
|
|
71
|
71
|
# Gateway and subnet defaults, in case they are not customized in localrc
|
72
|
|
-NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}
|
73
|
|
-PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
|
|
72
|
+NETWORK_GATEWAY=${NETWORK_GATEWAY:-}
|
|
73
|
+PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-}
|
74
|
74
|
PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
|
75
|
75
|
PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}
|
76
|
76
|
|
...
|
...
|
@@ -235,7 +235,9 @@ function _neutron_create_private_subnet_v4 {
|
235
|
235
|
local project_id=$1
|
236
|
236
|
local subnet_params="--tenant-id $project_id "
|
237
|
237
|
subnet_params+="--ip_version 4 "
|
238
|
|
- subnet_params+="--gateway $NETWORK_GATEWAY "
|
|
238
|
+ if [[ -n "$NETWORK_GATEWAY" ]]; then
|
|
239
|
+ subnet_params+="--gateway $NETWORK_GATEWAY "
|
|
240
|
+ fi
|
239
|
241
|
subnet_params+="--name $PRIVATE_SUBNET_NAME "
|
240
|
242
|
subnet_params+="$NET_ID $FIXED_RANGE"
|
241
|
243
|
local subnet_id
|
...
|
...
|
@@ -252,7 +254,9 @@ function _neutron_create_private_subnet_v6 {
|
252
|
252
|
local ipv6_modes="--ipv6-ra-mode $IPV6_RA_MODE --ipv6-address-mode $IPV6_ADDRESS_MODE"
|
253
|
253
|
local subnet_params="--tenant-id $project_id "
|
254
|
254
|
subnet_params+="--ip_version 6 "
|
255
|
|
- subnet_params+="--gateway $IPV6_PRIVATE_NETWORK_GATEWAY "
|
|
255
|
+ if [[ -n "$IPV6_PRIVATE_NETWORK_GATEWAY" ]]; then
|
|
256
|
+ subnet_params+="--gateway $IPV6_PRIVATE_NETWORK_GATEWAY "
|
|
257
|
+ fi
|
256
|
258
|
subnet_params+="--name $IPV6_PRIVATE_SUBNET_NAME "
|
257
|
259
|
subnet_params+="$NET_ID $FIXED_RANGE_V6 $ipv6_modes"
|
258
|
260
|
local ipv6_subnet_id
|
...
|
...
|
@@ -263,9 +267,11 @@ function _neutron_create_private_subnet_v6 {
|
263
|
263
|
|
264
|
264
|
# Create public IPv4 subnet
|
265
|
265
|
function _neutron_create_public_subnet_v4 {
|
266
|
|
- local subnet_params+="--ip_version 4 "
|
|
266
|
+ local subnet_params="--ip_version 4 "
|
267
|
267
|
subnet_params+="${Q_FLOATING_ALLOCATION_POOL:+--allocation-pool $Q_FLOATING_ALLOCATION_POOL} "
|
268
|
|
- subnet_params+="--gateway $PUBLIC_NETWORK_GATEWAY "
|
|
268
|
+ if [[ -n "$PUBLIC_NETWORK_GATEWAY" ]]; then
|
|
269
|
+ subnet_params+="--gateway $PUBLIC_NETWORK_GATEWAY "
|
|
270
|
+ fi
|
269
|
271
|
subnet_params+="--name $PUBLIC_SUBNET_NAME "
|
270
|
272
|
subnet_params+="$EXT_NET_ID $FLOATING_RANGE "
|
271
|
273
|
subnet_params+="-- --enable_dhcp=False"
|