Remove installation of python-netaddr
System and pip installation of this conflit and cause breakages.
Change-Id: I87a03f88a134683310d6ec0bd62d86c5007fcd72
diff --git a/files/apts/general b/files/apts/general
index ec6dd0d..fdf8e20 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -20,4 +20,3 @@
euca2ools # only for testing client
tar
python-cmd2 # dist:precise
-python-netaddr
diff --git a/files/apts/horizon b/files/apts/horizon
index e1ce85f..0865931 100644
--- a/files/apts/horizon
+++ b/files/apts/horizon
@@ -21,4 +21,3 @@
python-migrate
nodejs
nodejs-legacy # dist:quantal
-python-netaddr
diff --git a/files/apts/neutron b/files/apts/neutron
index 64fc1bf..0f4b69f 100644
--- a/files/apts/neutron
+++ b/files/apts/neutron
@@ -9,7 +9,6 @@
python-paste
python-routes
python-suds
-python-netaddr
python-pastedeploy
python-greenlet
python-kombu
diff --git a/files/apts/nova b/files/apts/nova
index 6a7ef74..ae925c3 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -30,7 +30,6 @@
python-libvirt # NOPRIME
python-libxml2
python-routes
-python-netaddr
python-numpy # used by websockify for spice console
python-pastedeploy
python-eventlet
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 93711ff..f28267c 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -7,7 +7,6 @@
openssl
psmisc
python-cmd2 # dist:opensuse-12.3
-python-netaddr
python-pip
python-pylint
python-unittest2
diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon
index 405fb7a..73932ac 100644
--- a/files/rpms-suse/horizon
+++ b/files/rpms-suse/horizon
@@ -15,7 +15,6 @@
python-eventlet
python-kombu
python-mox
-python-netaddr
python-nose
python-pylint
python-sqlalchemy-migrate
diff --git a/files/rpms-suse/neutron b/files/rpms-suse/neutron
index aadb156..e9ccf59 100644
--- a/files/rpms-suse/neutron
+++ b/files/rpms-suse/neutron
@@ -10,7 +10,6 @@
python-iso8601
python-kombu
python-mysql
-python-netaddr
python-Paste
python-PasteDeploy
python-pyudev
diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova
index edb1a8a..ee4917d 100644
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@@ -35,7 +35,6 @@
python-lxml # needed for glance which is needed for nova --- this shouldn't be here
python-mox
python-mysql
-python-netaddr
python-numpy # needed by websockify for spice console
python-paramiko
python-python-gflags
diff --git a/files/rpms/general b/files/rpms/general
index 5cb3e28..9fa305c 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -11,7 +11,6 @@
libxslt-devel # dist:rhel6 [2]
psmisc
pylint
-python-netaddr
python-pip
python-prettytable # dist:rhel6 [1]
python-unittest2
diff --git a/files/rpms/horizon b/files/rpms/horizon
index b844d98..0ca18ca 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,7 +16,6 @@
python-kombu
python-migrate
python-mox
-python-netaddr
python-nose
python-paste #dist:f16,f17,f18,f19
python-paste-deploy #dist:f16,f17,f18,f19
diff --git a/files/rpms/neutron b/files/rpms/neutron
index 6a8fd36..a7700f7 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -10,7 +10,6 @@
python-greenlet
python-iso8601
python-kombu
-python-netaddr
#rhel6 gets via pip
python-paste # dist:f16,f17,f18,f19
python-paste-deploy # dist:f16,f17,f18,f19
diff --git a/files/rpms/nova b/files/rpms/nova
index 8d8a0b8..c99f3de 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -28,7 +28,6 @@
python-lockfile
python-migrate
python-mox
-python-netaddr
python-paramiko # dist:f16,f17,f18,f19
# ^ on RHEL, brings in python-crypto which conflicts with version from
# pip we need