Remove duplicate packages.
pip is handled by devstack, so don't try and install it here.
Change-Id: I6f22e0f86ae071d30bf69de9ed5dec6b28ebc92b
| ... | ... |
@@ -94,8 +94,7 @@ CRONTAB |
| 94 | 94 |
|
| 95 | 95 |
# install_nova_hypervisor() - Install external components |
| 96 | 96 |
function install_nova_hypervisor {
|
| 97 |
- # This function intentionally left blank |
|
| 98 |
- : |
|
| 97 |
+ pip_install xenapi |
|
| 99 | 98 |
} |
| 100 | 99 |
|
| 101 | 100 |
# start_nova_hypervisor - Start any required external services |
| ... | ... |
@@ -73,9 +73,7 @@ EOF |
| 73 | 73 |
# Install basics |
| 74 | 74 |
apt-get update |
| 75 | 75 |
apt-get install -y cracklib-runtime curl wget ssh openssh-server tcpdump ethtool |
| 76 |
-apt-get install -y curl wget ssh openssh-server python-pip git sudo python-netaddr |
|
| 77 |
-apt-get install -y coreutils |
|
| 78 |
-pip install xenapi |
|
| 76 |
+apt-get install -y git sudo python-netaddr coreutils |
|
| 79 | 77 |
|
| 80 | 78 |
# Install XenServer guest utilities |
| 81 | 79 |
dpkg -i $XS_TOOLS_PATH |