openstack/trove
Code Issues Proposed changes

Merge "Drop logic for nova-network"

Browse Source
This commit is contained in:
Zuul
2025-04-02 02:27:22 +00:00
committed by Gerrit Code Review
parent 3fcabfd306 c58da3126e
commit a7bb63b366
4 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
integration/scripts/conf/test_begin.conf
View File

@@ -63,7 +63,6 @@
"rabbit_runs_locally": true, "rabbit_runs_locally": true,
"dbaas_datastore": "%datastore_type%", "dbaas_datastore": "%datastore_type%",
"dbaas_datastore_version": "%datastore_version%", "dbaas_datastore_version": "%datastore_version%",
"neutron_enabled": %neutron_enabled%,
"swift_enabled": %swift_enabled%, "swift_enabled": %swift_enabled%,
"shared_network": "%shared_network%", "shared_network": "%shared_network%",
"trove_mgmt_network": "trove-mgmt", "trove_mgmt_network": "trove-mgmt",

14
integration/scripts/localrc.rc
View File

@@ -16,14 +16,7 @@ ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
ENABLED_SERVICES+=,-n-novnc,-n-xvnc ENABLED_SERVICES+=,-n-novnc,-n-xvnc
if [[ $ENABLE_NEUTRON = true ]]; then ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta
ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta
disable_service n-net
else
PUBLIC_INTERFACE=eth0
enable_service n-net
disable_service neutron q-svc q-agt q-dhcp q-l3 q-meta
fi
# OSprofiler depends on Ceilometer # OSprofiler depends on Ceilometer
if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then
CEILOMETER_BACKEND=gnocchi CEILOMETER_BACKEND=gnocchi
@@ -39,10 +32,7 @@ if [[ $ENABLE_MISTRAL = true ]]; then
fi fi
# Use Git repositories for client components # Use Git repositories for client components
LIBS_FROM_GIT=python-troveclient LIBS_FROM_GIT=python-troveclient,python-neutronclient
if [[ $ENABLE_NEUTRON = true ]]; then
LIBS_FROM_GIT+=,python-neutronclient
fi
if [[ $ENABLE_MISTRAL = true ]]; then if [[ $ENABLE_MISTRAL = true ]]; then
LIBS_FROM_GIT+=,python-mistralclient LIBS_FROM_GIT+=,python-mistralclient
fi fi

19
integration/scripts/trovestack
View File

@@ -633,25 +633,16 @@ function mod_confs() {
sed -i "s/%admin_password%/$ADMIN_PASSWORD/g" $TEST_CONF sed -i "s/%admin_password%/$ADMIN_PASSWORD/g" $TEST_CONF
sed -i "s/%service_password%/$SERVICE_PASSWORD/g" $TEST_CONF sed -i "s/%service_password%/$SERVICE_PASSWORD/g" $TEST_CONF
# Enable neutron tests if needed
sed -i "s/%neutron_enabled%/$ENABLE_NEUTRON/g" $TEST_CONF
# Enable backup related tests if Swift is enabled # Enable backup related tests if Swift is enabled
sed -i "s/%swift_enabled%/$ENABLE_SWIFT/g" $TEST_CONF sed -i "s/%swift_enabled%/$ENABLE_SWIFT/g" $TEST_CONF
# If neutron is enabled, the devstack plugin has already set up the shared # If neutron is enabled, the devstack plugin has already set up the shared
# private network for testing. # private network for testing.
if [[ $ENABLE_NEUTRON = true ]]; then TROVE_NET_ID=$(openstack $CLOUD_ADMIN_ARG network list | grep " $TROVE_PRIVATE_NETWORK_NAME " | awk '{print $2}')
TROVE_NET_ID=$(openstack $CLOUD_ADMIN_ARG network list | grep " $TROVE_PRIVATE_NETWORK_NAME " | awk '{print $2}') TROVE_SUBNET_ID=$(openstack $CLOUD_ADMIN_ARG subnet list | grep " $TROVE_PRIVATE_SUBNET_NAME " | awk '{print $2}')
TROVE_SUBNET_ID=$(openstack $CLOUD_ADMIN_ARG subnet list | grep " $TROVE_PRIVATE_SUBNET_NAME " | awk '{print $2}') echo "Using network ${TROVE_PRIVATE_NETWORK_NAME} (${TROVE_NET_ID}): ${TROVE_PRIVATE_SUBNET_NAME} (${TROVE_SUBNET_ID})"
echo "Using network ${TROVE_PRIVATE_NETWORK_NAME} (${TROVE_NET_ID}): ${TROVE_PRIVATE_SUBNET_NAME} (${TROVE_SUBNET_ID})" sed -i "s,%shared_network%,$TROVE_NET_ID,g" $TEST_CONF
sed -i "s,%shared_network%,$TROVE_NET_ID,g" $TEST_CONF sed -i "s,%shared_network_subnet%,$TROVE_SUBNET_ID,g" $TEST_CONF
sed -i "s,%shared_network_subnet%,$TROVE_SUBNET_ID,g" $TEST_CONF
else
# do not leave invalid keys in the configuration when using Nova for networking
sed -i "/%shared_network%/d" $TEST_CONF
sed -i "/%shared_network_subnet%/d" $TEST_CONF
fi
if [[ "$DATASTORE_TYPE" = "vertica" ]]; then if [[ "$DATASTORE_TYPE" = "vertica" ]]; then
# Vertica needs more time than mysql for its boot/start/stop operations. # Vertica needs more time than mysql for its boot/start/stop operations.

3
integration/scripts/trovestack.rc
View File

@@ -10,9 +10,6 @@
# Try REGION_NAME then OS_REGION_NAME then RegionOne (the devstack default) # Try REGION_NAME then OS_REGION_NAME then RegionOne (the devstack default)
REGION_NAME=${REGION_NAME:-${OS_REGION_NAME:-RegionOne}} REGION_NAME=${REGION_NAME:-${OS_REGION_NAME:-RegionOne}}
# Enable Neutron
ENABLE_NEUTRON=$(get_bool ENABLE_NEUTRON true)
# Enable Swift # Enable Swift
ENABLE_SWIFT=$(get_bool ENABLE_SWIFT true) ENABLE_SWIFT=$(get_bool ENABLE_SWIFT true)