Merge "Fix an error message in the neutron script"

This commit is contained in:
Jenkins 2015-02-17 22:00:27 +00:00 committed by Gerrit Code Review
commit d5e934e23c

View File

@ -552,7 +552,7 @@ function create_neutron_initial_network {
sudo ip link set $PUBLIC_INTERFACE up sudo ip link set $PUBLIC_INTERFACE up
else else
NET_ID=$(neutron net-create --tenant-id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2) NET_ID=$(neutron net-create --tenant-id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2)
die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PHYSICAL_NETWORK $TENANT_ID" die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PRIVATE_NETWORK_NAME $TENANT_ID"
if [[ "$IP_VERSION" =~ 4.* ]]; then if [[ "$IP_VERSION" =~ 4.* ]]; then
# Create IPv4 private subnet # Create IPv4 private subnet