Merge "Stop using deprecated rabbit related config options"

This commit is contained in:
Jenkins
2015-03-26 11:59:52 +00:00
committed by Gerrit Code Review

View File

@@ -272,9 +272,9 @@ function iniset_rpc_backend {
fi fi
elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
iniset $file $section rpc_backend "rabbit" iniset $file $section rpc_backend "rabbit"
iniset $file $section rabbit_hosts $RABBIT_HOST iniset $file oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST
iniset $file $section rabbit_password $RABBIT_PASSWORD iniset $file oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $file $section rabbit_userid $RABBIT_USERID iniset $file oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
fi fi
} }