openstack/devstack
Code Issues Proposed changes

Merge "Prevent setting tempest fixed_network_name for cells"

Browse Source
This commit is contained in:
Jenkins 2015-05-14 03:23:17 +00:00 committed by Gerrit Code Review
commit bf5de0aee4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tempest
View File

@ -344,7 +344,9 @@ function configure_tempest {
iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
if ! is_service_enabled n-cell; then
iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
fi
# Compute Features # Compute Features
# Run ``verify_tempest_config -ur`` to retrieve enabled extensions on API endpoints # Run ``verify_tempest_config -ur`` to retrieve enabled extensions on API endpoints

7
stack.sh
View File

@ -1213,13 +1213,6 @@ if is_service_enabled q-svc; then
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
NM_CONF=${NOVA_CONF} NM_CONF=${NOVA_CONF}
if is_service_enabled n-cell; then 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} NM_CONF=${NOVA_CELLS_CONF}
fi fi