openstack/devstack
Code Issues Proposed changes

XenAPI: Find location for XenAPI plugins

Browse Source 
Plugins can be installed in different places in dom0; re-enable the
use of xapi_plugin_location

Change-Id: If94ec6b250ad5b4f7730cfbf443d937eb85feb5c
This commit is contained in:
Bob Ball 2014-03-20 16:56:04 +00:00
parent 871b1e4709
commit 348ae44f64
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova_plugins/hypervisor-xenserver
View File

@ -63,9 +63,13 @@ function configure_nova_hypervisor {
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
xen_functions=`cat $TOP_DIR/tools/xen/functions`
PLUGIN_DIR=`$ssh_dom0 "$xen_functions; set -eux; xapi_plugin_location"`
# install nova plugins to dom0
tar -czf - -C $NOVA_DIR/plugins/xenserver/xenapi/etc/xapi.d/plugins/ ./ |
$ssh_dom0 'tar -xzf - -C /etc/xapi.d/plugins/ && chmod a+x /etc/xapi.d/plugins/*'
$ssh_dom0 "tar -xzf - -C $PLUGIN_DIR && chmod a+x $PLUGIN_DIR/*"
# install console logrotate script
tar -czf - -C $NOVA_DIR/tools/xenserver/ rotate_xen_guest_logs.sh |