...
|
...
|
@@ -551,12 +551,12 @@ function create_neutron_initial_network {
|
551
|
551
|
die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PHYSICAL_NETWORK $TENANT_ID"
|
552
|
552
|
|
553
|
553
|
if [[ "$IP_VERSION" =~ 4.* ]]; then
|
554
|
|
- SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --name $PROVIDER_SUBNET_NAME --gateway $NETWORK_GATEWAY --subnetpool None $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2)
|
|
554
|
+ SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --name $PROVIDER_SUBNET_NAME --gateway $NETWORK_GATEWAY $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2)
|
555
|
555
|
die_if_not_set $LINENO SUBNET_ID "Failure creating SUBNET_ID for $PROVIDER_SUBNET_NAME $TENANT_ID"
|
556
|
556
|
fi
|
557
|
557
|
|
558
|
558
|
if [[ "$IP_VERSION" =~ .*6 ]] && [[ -n "$IPV6_PROVIDER_FIXED_RANGE" ]] && [[ -n "$IPV6_PROVIDER_NETWORK_GATEWAY" ]]; then
|
559
|
|
- SUBNET_V6_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 6 --ipv6-address-mode $IPV6_ADDRESS_MODE --gateway $IPV6_PROVIDER_NETWORK_GATEWAY --name $IPV6_PROVIDER_SUBNET_NAME --subnetpool None $NET_ID $IPV6_PROVIDER_FIXED_RANGE | grep 'id' | get_field 2)
|
|
559
|
+ SUBNET_V6_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 6 --ipv6-address-mode $IPV6_ADDRESS_MODE --gateway $IPV6_PROVIDER_NETWORK_GATEWAY --name $IPV6_PROVIDER_SUBNET_NAME $NET_ID $IPV6_PROVIDER_FIXED_RANGE | grep 'id' | get_field 2)
|
560
|
560
|
die_if_not_set $LINENO SUBNET_V6_ID "Failure creating SUBNET_V6_ID for $IPV6_PROVIDER_SUBNET_NAME $TENANT_ID"
|
561
|
561
|
fi
|
562
|
562
|
|
...
|
...
|
@@ -1262,7 +1262,6 @@ function _neutron_create_private_subnet_v4 {
|
1262
|
1262
|
subnet_params+="--ip_version 4 "
|
1263
|
1263
|
subnet_params+="--gateway $NETWORK_GATEWAY "
|
1264
|
1264
|
subnet_params+="--name $PRIVATE_SUBNET_NAME "
|
1265
|
|
- subnet_params+="--subnetpool None "
|
1266
|
1265
|
subnet_params+="$NET_ID $FIXED_RANGE"
|
1267
|
1266
|
local subnet_id
|
1268
|
1267
|
subnet_id=$(neutron subnet-create $subnet_params | grep ' id ' | get_field 2)
|
...
|
...
|
@@ -1279,7 +1278,6 @@ function _neutron_create_private_subnet_v6 {
|
1279
|
1279
|
subnet_params+="--ip_version 6 "
|
1280
|
1280
|
subnet_params+="--gateway $IPV6_PRIVATE_NETWORK_GATEWAY "
|
1281
|
1281
|
subnet_params+="--name $IPV6_PRIVATE_SUBNET_NAME "
|
1282
|
|
- subnet_params+="--subnetpool None "
|
1283
|
1282
|
subnet_params+="$NET_ID $FIXED_RANGE_V6 $ipv6_modes"
|
1284
|
1283
|
local ipv6_subnet_id
|
1285
|
1284
|
ipv6_subnet_id=$(neutron subnet-create $subnet_params | grep ' id ' | get_field 2)
|
...
|
...
|
@@ -1293,7 +1291,6 @@ function _neutron_create_public_subnet_v4 {
|
1293
|
1293
|
subnet_params+="${Q_FLOATING_ALLOCATION_POOL:+--allocation-pool $Q_FLOATING_ALLOCATION_POOL} "
|
1294
|
1294
|
subnet_params+="--gateway $PUBLIC_NETWORK_GATEWAY "
|
1295
|
1295
|
subnet_params+="--name $PUBLIC_SUBNET_NAME "
|
1296
|
|
- subnet_params+="--subnetpool None "
|
1297
|
1296
|
subnet_params+="$EXT_NET_ID $FLOATING_RANGE "
|
1298
|
1297
|
subnet_params+="-- --enable_dhcp=False"
|
1299
|
1298
|
local id_and_ext_gw_ip
|
...
|
...
|
@@ -1307,7 +1304,6 @@ function _neutron_create_public_subnet_v6 {
|
1307
|
1307
|
local subnet_params="--ip_version 6 "
|
1308
|
1308
|
subnet_params+="--gateway $IPV6_PUBLIC_NETWORK_GATEWAY "
|
1309
|
1309
|
subnet_params+="--name $IPV6_PUBLIC_SUBNET_NAME "
|
1310
|
|
- subnet_params+="--subnetpool None "
|
1311
|
1310
|
subnet_params+="$EXT_NET_ID $IPV6_PUBLIC_RANGE "
|
1312
|
1311
|
subnet_params+="-- --enable_dhcp=False"
|
1313
|
1312
|
local ipv6_id_and_ext_gw_ip
|