Merge "Fix failure in devstack single node deployment of congress"

This commit is contained in:
Zuul 2017-11-29 01:46:03 +00:00 committed by Gerrit Code Review
commit 60cf91c0b2
2 changed files with 1 additions and 9 deletions

View File

@ -62,13 +62,7 @@ function configure_congress {
iniset $CONGRESS_CONF DEFAULT auth_strategy $CONGRESS_AUTH_STRATEGY
iniset $CONGRESS_CONF DEFAULT datasource_sync_period 30
iniset $CONGRESS_CONF DEFAULT replicated_policy_engine "$CONGRESS_REPLICATED"
if [ "$CONGRESS_MULTIPROCESS_DEPLOYMENT" == "True" ]; then
iniset $CONGRESS_CONF DEFAULT transport_url rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672
fi
# if [ "$CONGRESS_MULTIPROCESS_DEPLOYMENT" == "False" ]; then
# iniset $CONGRESS_CONF DEFAULT transport_url $CONGRESS_TRANSPORT_URL
# fi
iniset $CONGRESS_CONF DEFAULT transport_url rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672
CONGRESS_DRIVERS="congress.datasources.neutronv2_driver.NeutronV2Driver,"
CONGRESS_DRIVERS+="congress.datasources.neutronv2_qos_driver.NeutronV2QosDriver,"

View File

@ -32,8 +32,6 @@ CONGRESS_AUTH_STRATEGY=${CONGRESS_AUTH_STRATEGY:-keystone}
CONGRESS_DB_NAME=${CONGRESS_DB_NAME:-congress}
# To run congress in HA mode
CONGRESS_REPLICATED=${CONGRESS_REPLICATED:-False}
# Default messaging driver
CONGRESS_TRANSPORT_URL=${CONGRESS_TRANSPORT_URL:-kombu+memory:////}
# Mutli process deployment
CONGRESS_MULTIPROCESS_DEPLOYMENT=${CONGRESS_MULTIPROCESS_DEPLOYMENT:-False}
# Directory path to library policy files