Don't install vim or locate by default
Devstack doesn't need vim or locate, if someone wants to use them, they
can just install them afterwards.
Change-Id: I00f27c20c86d89465e4aefc67ed645a309c09a03
diff --git a/files/apts/general b/files/apts/general
index 32d31f0..995c0c6 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -9,8 +9,6 @@
lsof # useful when debugging
openssh-server
openssl
-vim-nox
-locate # useful when debugging
python-virtualenv
python-unittest2
iputils-ping
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 6d994ea..ff27a3a 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -3,7 +3,6 @@
ca-certificates-mozilla
curl
euca2ools
-findutils-locate # useful when debugging
git-core
iputils
libopenssl-devel # to rebuild pyOpenSSL if needed
@@ -20,5 +19,4 @@
tar
tcpdump
unzip
-vim-enhanced
wget
diff --git a/tools/xen/prepare_guest.sh b/tools/xen/prepare_guest.sh
index 440774e..2b5e418 100755
--- a/tools/xen/prepare_guest.sh
+++ b/tools/xen/prepare_guest.sh
@@ -73,7 +73,7 @@
# 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 vim-nox sudo python-netaddr
+apt-get install -y curl wget ssh openssh-server python-pip git sudo python-netaddr
pip install xenapi
# Install XenServer guest utilities