Stop using deprecated rabbit related config options

Stop services from throwing the following warning:
  Option "rabbit_password" from group "DEFAULT" is deprecated. Use option
  "rabbit_password" from group "oslo_messaging_rabbit".
Same for rabbit_hosts and rabbit_userid

Change-Id: I7da503ef50b3653b888cb243caa74b4253a495e2
This commit is contained in:
Joe Gordon 2015-03-23 15:05:39 -07:00
parent e467cdfeb1
commit d01ff96e3f

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
} }