@@ -72,10 +72,13 @@ function quantum_plugin_configure_plugin_agent() {

     AGENT_BINARY="$QUANTUM_DIR/bin/quantum-openvswitch-agent"

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

-        # Nova will always be installed along with quantum for a domU

-        # devstack install, so it should be safe to rely on nova.conf

-        # for xenapi configuration.

-        Q_RR_DOM0_COMMAND="$QUANTUM_DIR/bin/quantum-rootwrap-xen-dom0 $NOVA_CONF"

+        Q_RR_DOM0_COMMAND="$QUANTUM_DIR/bin/quantum-rootwrap-xen-dom0 $Q_RR_CONF_FILE"

+

+        # For now, duplicate the xen configuration already found in nova.conf

+        iniset $Q_RR_CONF_FILE XENAPI xenapi_connection_url "$XENAPI_CONNECTION_URL"

+        iniset $Q_RR_CONF_FILE XENAPI xenapi_connection_username "$XENAPI_USER"

+        iniset $Q_RR_CONF_FILE XENAPI xenapi_connection_password "$XENAPI_PASSWORD"

+

         # Under XS/XCP, the ovs agent needs to target the dom0

         # integration bridge.  This is enabled by using a root wrapper

         # that executes commands on dom0 via a XenAPI plugin.

@@ -924,8 +924,6 @@ if is_service_enabled nova; then

         echo_summary "Using XenServer virtualization driver"

         read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."

         iniset $NOVA_CONF DEFAULT compute_driver "xenapi.XenAPIDriver"

-        XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}

-        XENAPI_USER=${XENAPI_USER:-"root"}

         iniset $NOVA_CONF DEFAULT xenapi_connection_url "$XENAPI_CONNECTION_URL"

         iniset $NOVA_CONF DEFAULT xenapi_connection_username "$XENAPI_USER"

         iniset $NOVA_CONF DEFAULT xenapi_connection_password "$XENAPI_PASSWORD"

@@ -224,6 +224,10 @@ PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}

 # Compatibility until it's eradicated from CI

 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}

+# Xen config common to nova and quantum

+XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}

+XENAPI_USER=${XENAPI_USER:-"root"}

+

 # Local variables:

 # mode: shell-script

 # End: