From bb1e07859cce688e3beed2c573e9073a72f778fb Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Thu, 6 Mar 2014 09:40:27 -0800
Subject: [PATCH] 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
---
 files/apts/general         | 2 --
 files/rpms-suse/general    | 2 --
 tools/xen/prepare_guest.sh | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/files/apts/general b/files/apts/general
index 32d31f0642..995c0c6f88 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -9,8 +9,6 @@ git
 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 6d994eaf7a..ff27a3aac7 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -3,7 +3,6 @@ bridge-utils
 ca-certificates-mozilla
 curl
 euca2ools
-findutils-locate # useful when debugging
 git-core
 iputils
 libopenssl-devel # to rebuild pyOpenSSL if needed
@@ -20,5 +19,4 @@ screen
 tar
 tcpdump
 unzip
-vim-enhanced
 wget
diff --git a/tools/xen/prepare_guest.sh b/tools/xen/prepare_guest.sh
index 440774ec5b..2b5e418a6a 100755
--- a/tools/xen/prepare_guest.sh
+++ b/tools/xen/prepare_guest.sh
@@ -73,7 +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 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