Prevent setting tempest fixed_network_name for cells
Instead of creating a network in both the API cell and child cell,
let tempest use the old behavior of not querying networks from the
API for testing server create.
Change-Id: I9809d2b2e796ff1a5ea7e4f25bbeb21bd4817a72
diff --git a/lib/tempest b/lib/tempest
index cd8fbd7..dc5fb51 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -340,7 +340,9 @@
iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
- iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
+ if ! is_service_enabled n-cell; then
+ iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
+ fi
# Compute Features
# Run ``verify_tempest_config -ur`` to retrieve enabled extensions on API endpoints
diff --git a/stack.sh b/stack.sh
index 5cdcbdf..7a5cbcc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1214,13 +1214,6 @@
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
NM_CONF=${NOVA_CONF}
if is_service_enabled n-cell; then
- # Both cells should have the same network uuid for server create
- if [[ ! "$NETWORK_CREATE_ARGS" =~ "--uuid" ]]; then
- NETWORK_CREATE_ARGS="$NETWORK_CREATE_ARGS --uuid $(uuidgen)"
- fi
- # Create a small network in the API cell
- $NOVA_BIN_DIR/nova-manage --config-file $NM_CONF network create "$PRIVATE_NETWORK_NAME" $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS
- # Everything else should go in the child cell
NM_CONF=${NOVA_CELLS_CONF}
fi