Browse code
Specify network UUID for network create with cells
When the n-cell service is enabled, we create networks in both the
API cell and the child cell. Recent changes to tempest have tests
querying networks from the API and passing them for a server create.
In order for this to work in cells, the UUIDs for the network in
the API cell and the child cell must match, else the network won't
be found in the child.
This change adds the --uuid option to the nova-manage network create
command for cells only.
Related-Bug: #1441931
Depends-On: Ib29e632b09905f557a7a6910d58207ed91cdc047
Change-Id: Ib5933b1405c0761ff727e04cda0c502a826c8eaf
melanie witt authored on 2015/04/09 08:02:59Showing 1 changed files
| ... | ... |
@@ -1214,6 +1214,10 @@ if is_service_enabled q-svc; then |
| 1214 | 1214 |
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then |
| 1215 | 1215 |
NM_CONF=${NOVA_CONF}
|
| 1216 | 1216 |
if is_service_enabled n-cell; then |
| 1217 |
+ # Both cells should have the same network uuid for server create |
|
| 1218 |
+ if [[ ! "$NETWORK_CREATE_ARGS" =~ "--uuid" ]]; then |
|
| 1219 |
+ NETWORK_CREATE_ARGS="$NETWORK_CREATE_ARGS --uuid $(uuidgen)" |
|
| 1220 |
+ fi |
|
| 1217 | 1221 |
# Create a small network in the API cell |
| 1218 | 1222 |
$NOVA_BIN_DIR/nova-manage --config-file $NM_CONF network create "$PRIVATE_NETWORK_NAME" $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS |
| 1219 | 1223 |
# Everything else should go in the child cell |