Allow users to auto-create a neutron non-flat providernet public network
and use it for external router interfaces. By default, keep the existing
flat network type behavior.
Change-Id: I64f71b0c9fcac97b9b84b7d30ee61659b2a690f1
... | ... |
@@ -39,9 +39,9 @@ Q_PUBLIC_VETH_INT=${Q_PUBLIC_VETH_INT:-veth-pub-int} |
39 | 39 |
Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-True} |
40 | 40 |
|
41 | 41 |
|
42 |
-# Use flat providernet for public network |
|
42 |
+# Use providernet for public network |
|
43 | 43 |
# |
44 |
-# If Q_USE_PROVIDERNET_FOR_PUBLIC=True, use a flat provider network |
|
44 |
+# If Q_USE_PROVIDERNET_FOR_PUBLIC=True, use a provider network |
|
45 | 45 |
# for external interface of neutron l3-agent. In that case, |
46 | 46 |
# PUBLIC_PHYSICAL_NETWORK specifies provider:physical_network value |
47 | 47 |
# used for the network. In case of ofagent, you should add the |
... | ... |
@@ -59,6 +59,10 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-True} |
59 | 59 |
# Q_USE_PROVIDERNET_FOR_PUBLIC=True |
60 | 60 |
# PUBLIC_PHYSICAL_NETWORK=public |
61 | 61 |
# OVS_BRIDGE_MAPPINGS=public:br-ex |
62 |
+# |
|
63 |
+# The provider-network-type defaults to flat, however, the values |
|
64 |
+# PUBLIC_PROVIDERNET_TYPE and PUBLIC_PROVIDERNET_SEGMENTATION_ID could |
|
65 |
+# be set to specify the parameters for an alternate network type. |
|
62 | 66 |
Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True} |
63 | 67 |
PUBLIC_PHYSICAL_NETWORK=${PUBLIC_PHYSICAL_NETWORK:-public} |
64 | 68 |
|
... | ... |
@@ -240,7 +244,7 @@ function create_neutron_initial_network { |
240 | 240 |
fi |
241 | 241 |
# Create an external network, and a subnet. Configure the external network as router gw |
242 | 242 |
if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then |
243 |
- EXT_NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create "$PUBLIC_NETWORK_NAME" $EXTERNAL_NETWORK_FLAGS --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} | grep ' id ' | get_field 2) |
|
243 |
+ EXT_NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create "$PUBLIC_NETWORK_NAME" $EXTERNAL_NETWORK_FLAGS --provider-network-type ${PUBLIC_PROVIDERNET_TYPE:-flat} ${PUBLIC_PROVIDERNET_SEGMENTATION_ID:+--provider-segment $PUBLIC_PROVIDERNET_SEGMENTATION_ID} --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} | grep ' id ' | get_field 2) |
|
244 | 244 |
else |
245 | 245 |
EXT_NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create "$PUBLIC_NETWORK_NAME" $EXTERNAL_NETWORK_FLAGS | grep ' id ' | get_field 2) |
246 | 246 |
fi |