From be485221b321ebb418f3f5dd8d86e164797f07de Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Wed, 10 Dec 2014 10:33:53 +0000 Subject: [PATCH] XenAPI: Simplify installed packages Remove duplicate packages. pip is handled by devstack, so don't try and install it here. Change-Id: I6f22e0f86ae071d30bf69de9ed5dec6b28ebc92b --- lib/nova_plugins/hypervisor-xenserver | 3 +-- tools/xen/prepare_guest.sh | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/nova_plugins/hypervisor-xenserver b/lib/nova_plugins/hypervisor-xenserver index db19cc2fb6..4d0ec898ad 100644 --- a/lib/nova_plugins/hypervisor-xenserver +++ b/lib/nova_plugins/hypervisor-xenserver @@ -94,8 +94,7 @@ CRONTAB # install_nova_hypervisor() - Install external components function install_nova_hypervisor { - # This function intentionally left blank - : + pip_install xenapi } # start_nova_hypervisor - Start any required external services diff --git a/tools/xen/prepare_guest.sh b/tools/xen/prepare_guest.sh index 7383c91e37..7fe032a064 100755 --- a/tools/xen/prepare_guest.sh +++ b/tools/xen/prepare_guest.sh @@ -73,9 +73,7 @@ EOF # Install basics apt-get update apt-get install -y cracklib-runtime curl wget ssh openssh-server tcpdump ethtool -apt-get install -y curl wget ssh openssh-server python-pip git sudo python-netaddr -apt-get install -y coreutils -pip install xenapi +apt-get install -y git sudo python-netaddr coreutils # Install XenServer guest utilities dpkg -i $XS_TOOLS_PATH