From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 7 Dec 2018 14:04:11 +0000 (-0500)
Subject: ceph-volume jobs: remove installation of python-netaddr
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fcv-netaddr;p=ceph-build.git

ceph-volume jobs: remove installation of python-netaddr

This was wrongly assumed, netaddr required to be installed in the
virtualenv, and that is the case now. This is no longer necessary, so
removing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index be04d333b..1e3f1efb6 100644
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -8,14 +8,6 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 # if this project was started manually
 github_status_setup
 
-# ceph-ansible now requires a dependency on the control node (this machine) in
-# order to work properly
-if test -f /etc/redhat-release ; then
-    sudo yum install python-netaddr
-else
-    sudo apt-get install python-netaddr
-fi
-
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" "github-status>0.0.3" )
 install_python_packages "pkgs[@]"
diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index 44a0e8ef8..3aad0f66f 100644
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -2,14 +2,6 @@
 set -ex
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
-# ceph-ansible now requires a dependency on the control node (this machine) in
-# order to work properly
-if test -f /etc/redhat-release ; then
-    sudo yum install python-netaddr
-else
-    sudo apt-get install python-netaddr
-fi
-
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
 install_python_packages "pkgs[@]"
diff --git a/ceph-volume-scenario/build/build b/ceph-volume-scenario/build/build
index c5ec277a2..2bac2e594 100644
--- a/ceph-volume-scenario/build/build
+++ b/ceph-volume-scenario/build/build
@@ -2,14 +2,6 @@
 set -ex
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
-# ceph-ansible now requires a dependency on the control node (this machine) in
-# order to work properly
-if test -f /etc/redhat-release ; then
-    sudo yum install python-netaddr
-else
-    sudo apt-get install python-netaddr
-fi
-
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
 install_python_packages "pkgs[@]"