Merge "Ensure we install tempest-lib from git in tempest's tox venv"
diff --git a/files/debs/general b/files/debs/general
index 4050191..5047c12 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -1,5 +1,4 @@
bridge-utils
-pylint
screen
unzip
wget
@@ -10,17 +9,12 @@
lsof # useful when debugging
openssh-server
openssl
-python-virtualenv
-python-unittest2
iputils-ping
wget
curl
tcpdump
-euca2ools # only for testing client
tar
-python-cmd2 # dist:precise
python-dev
-python-mock # testonly
python2.7
bc
libyaml-dev
diff --git a/files/debs/glance b/files/debs/glance
index 8db8145..9fda6a6 100644
--- a/files/debs/glance
+++ b/files/debs/glance
@@ -3,11 +3,4 @@
libssl-dev # testonly
libxml2-dev
libxslt1-dev # testonly
-python-eventlet
-python-routes
-python-greenlet
-python-sqlalchemy
-python-pastedeploy
-python-xattr
-python-iso8601
zlib1g-dev # testonly
diff --git a/files/debs/horizon b/files/debs/horizon
index f9b7d59..1f45b54 100644
--- a/files/debs/horizon
+++ b/files/debs/horizon
@@ -1,19 +1,3 @@
apache2 # NOPRIME
libapache2-mod-wsgi # NOPRIME
-python-beautifulsoup
-python-dateutil
-python-paste
-python-pastedeploy
-python-anyjson
-python-routes
-python-xattr
-python-sqlalchemy
-python-webob
-pylint
-python-eventlet
-python-nose
-python-mox
-python-coverage
-python-cherrypy3 # why?
-python-migrate
libpcre3-dev # pyScss
diff --git a/files/debs/keystone b/files/debs/keystone
index d316a42..70a5649 100644
--- a/files/debs/keystone
+++ b/files/debs/keystone
@@ -1,15 +1,7 @@
python-lxml
-python-pastescript
-python-pastedeploy
-python-paste
sqlite3
-python-pysqlite2
-python-sqlalchemy
python-mysqldb
python-mysql.connector
-python-webob
-python-greenlet
-python-routes
libldap2-dev
libsasl2-dev
libkrb5-dev
diff --git a/files/debs/n-api b/files/debs/n-api
index b4372d9..0928cd5 100644
--- a/files/debs/n-api
+++ b/files/debs/n-api
@@ -1,3 +1 @@
-python-dateutil
-msgpack-python
fping
diff --git a/files/debs/neutron b/files/debs/neutron
index 3f4b6d2..aa3d709 100644
--- a/files/debs/neutron
+++ b/files/debs/neutron
@@ -7,17 +7,8 @@
mysql-server #NOPRIME
sudo
postgresql-server-dev-all # testonly
-python-iso8601
-python-paste
-python-routes
-python-suds
-python-pastedeploy
-python-greenlet
-python-eventlet
-python-sqlalchemy
python-mysqldb
python-mysql.connector
-python-pyudev
python-qpid # NOPRIME
dnsmasq-base
dnsmasq-utils # for dhcp_release only available in dist:precise
diff --git a/files/debs/nova b/files/debs/nova
index 66f29c4..0c31385 100644
--- a/files/debs/nova
+++ b/files/debs/nova
@@ -8,7 +8,6 @@
mysql-server # NOPRIME
python-mysqldb
python-mysql.connector
-python-xattr # needed for glance which is needed for nova --- this shouldn't be here
python-lxml # needed for glance which is needed for nova --- this shouldn't be here
gawk
iptables
@@ -27,22 +26,8 @@
rabbitmq-server # NOPRIME
qpidd # NOPRIME
socat # used by ajaxterm
-python-mox
-python-paste
-python-migrate
-python-greenlet
python-libvirt # NOPRIME
python-libxml2
-python-routes
python-numpy # used by websockify for spice console
-python-pastedeploy
-python-eventlet
-python-cheetah
-python-tempita
-python-sqlalchemy
-python-suds
-python-lockfile
python-m2crypto
-python-feedparser
-python-iso8601
python-qpid # NOPRIME
diff --git a/files/debs/swift b/files/debs/swift
index fd51699..b32b439 100644
--- a/files/debs/swift
+++ b/files/debs/swift
@@ -1,14 +1,7 @@
curl
memcached
-python-configobj
-python-coverage
-python-eventlet
-python-greenlet
-python-netifaces
+# NOTE python-nose only exists because of swift functional job, we should probably
+# figure out a more consistent way of installing this from test-requirements.txt instead
python-nose
-python-pastedeploy
-python-simplejson
-python-webob
-python-xattr
sqlite3
xfsprogs