@@ -1670,11 +1670,11 @@ add_nova_opt "vncserver_proxyclient_address=$VNCSERVER_PROXYCLIENT_ADDRESS"

 add_nova_opt "api_paste_config=$NOVA_CONF_DIR/api-paste.ini"

 add_nova_opt "image_service=nova.image.glance.GlanceImageService"

 add_nova_opt "ec2_dmz_host=$EC2_DMZ_HOST"

-if is_service_enabled rabbit ; then

+if is_service_enabled qpid ; then

+    add_nova_opt "rpc_backend=nova.rpc.impl_qpid"

+elif [ -n "$RABBIT_HOST" ] &&  [ -n "$RABBIT_PASSWORD" ]; then

     add_nova_opt "rabbit_host=$RABBIT_HOST"

     add_nova_opt "rabbit_password=$RABBIT_PASSWORD"

-elif is_service_enabled qpid ; then

-    add_nova_opt "rpc_backend=nova.rpc.impl_qpid"

 fi

 add_nova_opt "glance_api_servers=$GLANCE_HOSTPORT"

 add_nova_opt "force_dhcp_release=True"