XenAPI: move Neutron plugin install to domU
Use the same mechanism as used for nova plugin installation, thus
avoiding the need for variables in dom0. This change will also help to
move XenServer CI to neutron in the future, as the dom0 part of the
script is not executed there.
With this change, the neutron related network will always be created and
attached even if the user wants to use nova-network.
Change-Id: I8669c94e9f0aacce2990469dbabde1ff702a2769
diff --git a/lib/neutron b/lib/neutron
index ca9b16c..43167d8 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -595,6 +595,24 @@
function install_neutron {
git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH
setup_develop $NEUTRON_DIR
+
+ if [ "$VIRT_DRIVER" == 'xenserver' ]; then
+ local dom0_ip
+ dom0_ip=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3-)
+
+ local ssh_dom0
+ ssh_dom0="sudo -u $DOMZERO_USER ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@$dom0_ip"
+
+ # Find where the plugins should go in dom0
+ local xen_functions
+ xen_functions=$(cat $TOP_DIR/tools/xen/functions)
+ local plugin_dir
+ plugin_dir=$($ssh_dom0 "$xen_functions; set -eux; xapi_plugin_location")
+
+ # install neutron plugins to dom0
+ tar -czf - -C $NEUTRON_DIR/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/ ./ |
+ $ssh_dom0 "tar -xzf - -C $plugin_dir && chmod a+x $plugin_dir/*"
+ fi
}
# install_neutronclient() - Collect source and prepare