Merge "Don't install vim or locate by default"

This commit is contained in:
Jenkins 2014-03-08 18:12:44 +00:00 committed by Gerrit Code Review
commit 6cb378f8bd
3 changed files with 1 additions and 5 deletions

View File

@ -9,8 +9,6 @@ git
lsof # useful when debugging lsof # useful when debugging
openssh-server openssh-server
openssl openssl
vim-nox
locate # useful when debugging
python-virtualenv python-virtualenv
python-unittest2 python-unittest2
iputils-ping iputils-ping

View File

@ -3,7 +3,6 @@ bridge-utils
ca-certificates-mozilla ca-certificates-mozilla
curl curl
euca2ools euca2ools
findutils-locate # useful when debugging
git-core git-core
iputils iputils
libopenssl-devel # to rebuild pyOpenSSL if needed libopenssl-devel # to rebuild pyOpenSSL if needed
@ -20,5 +19,4 @@ screen
tar tar
tcpdump tcpdump
unzip unzip
vim-enhanced
wget wget

View File

@ -73,7 +73,7 @@ EOF
# Install basics # Install basics
apt-get update apt-get update
apt-get install -y cracklib-runtime curl wget ssh openssh-server tcpdump ethtool 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 vim-nox sudo python-netaddr apt-get install -y curl wget ssh openssh-server python-pip git sudo python-netaddr
pip install xenapi pip install xenapi
# Install XenServer guest utilities # Install XenServer guest utilities