From 60aba9cb6a251b72a73a0c52f6c77c5356d6dcfc Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 2 Aug 2013 17:12:45 -0400
Subject: [PATCH] Remove installation of python-netaddr

System and pip installation of this conflit and cause breakages.

Change-Id: I87a03f88a134683310d6ec0bd62d86c5007fcd72
---
 files/apts/general      | 1 -
 files/apts/horizon      | 1 -
 files/apts/neutron      | 1 -
 files/apts/nova         | 1 -
 files/rpms-suse/general | 1 -
 files/rpms-suse/horizon | 1 -
 files/rpms-suse/neutron | 1 -
 files/rpms-suse/nova    | 1 -
 files/rpms/general      | 1 -
 files/rpms/horizon      | 1 -
 files/rpms/neutron      | 1 -
 files/rpms/nova         | 1 -
 12 files changed, 12 deletions(-)

diff --git a/files/apts/general b/files/apts/general
index ec6dd0db4b..fdf8e20ad5 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -20,4 +20,3 @@ tcpdump
 euca2ools # only for testing client
 tar
 python-cmd2 # dist:precise
-python-netaddr
diff --git a/files/apts/horizon b/files/apts/horizon
index e1ce85f7d5..0865931d44 100644
--- a/files/apts/horizon
+++ b/files/apts/horizon
@@ -21,4 +21,3 @@ python-cherrypy3 # why?
 python-migrate
 nodejs
 nodejs-legacy # dist:quantal
-python-netaddr
diff --git a/files/apts/neutron b/files/apts/neutron
index 64fc1bfb2d..0f4b69f8ef 100644
--- a/files/apts/neutron
+++ b/files/apts/neutron
@@ -9,7 +9,6 @@ python-iso8601
 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 6a7ef74c59..ae925c3293 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -30,7 +30,6 @@ python-greenlet
 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 93711ff784..f28267c044 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -7,7 +7,6 @@ openssh
 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 405fb7ac56..73932acc1d 100644
--- a/files/rpms-suse/horizon
+++ b/files/rpms-suse/horizon
@@ -15,7 +15,6 @@ python-dateutil
 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 aadb156732..e9ccf5921b 100644
--- a/files/rpms-suse/neutron
+++ b/files/rpms-suse/neutron
@@ -10,7 +10,6 @@ python-greenlet
 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 edb1a8a8e6..ee4917d702 100644
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@@ -35,7 +35,6 @@ python-lockfile
 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 5cb3e28c6b..9fa305c992 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -11,7 +11,6 @@ libxml2-devel # dist:rhel6 [2]
 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 b844d98665..0ca18cadb7 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,7 +16,6 @@ python-httplib2
 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 6a8fd3639c..a7700f77d4 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -10,7 +10,6 @@ python-eventlet
 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 8d8a0b875a..c99f3defc8 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -28,7 +28,6 @@ python-kombu
 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