From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 31 Oct 2018 19:47:39 +0000 (-0400)
Subject: ceph-volume ansible jobs need python-netaddr installed in the controlling node
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=443ee9bcdf764aca35dd119b91e5d445ca639891;p=ceph-build.git

ceph-volume ansible jobs need python-netaddr installed in the controlling node

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 282fe863..00d62f10 100644
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -8,8 +8,13 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 # if this project was started manually
 github_status_setup
 
-# TODO: at this point a `curl` to shaman is needed to verify that the repo is
-# ready to be consumed
+# 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" )
diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index 83e1d482..f03c0990 100644
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -2,11 +2,18 @@
 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[@]"
 
-
 delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
diff --git a/ceph-volume-scenario/build/build b/ceph-volume-scenario/build/build
index 2bac2e59..c5ec277a 100644
--- a/ceph-volume-scenario/build/build
+++ b/ceph-volume-scenario/build/build
@@ -2,6 +2,14 @@
 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[@]"