]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-volume ansible jobs need python-netaddr installed in the controlling node 1187/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 31 Oct 2018 19:47:39 +0000 (15:47 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 31 Oct 2018 19:47:39 +0000 (15:47 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph-volume-ansible-prs/build/build
ceph-volume-nightly/build/build
ceph-volume-scenario/build/build

index 282fe86323b90107d30d902c5528538b5fe59b0e..00d62f10a3fca680e9a132c5a3b8381bcd4f971b 100644 (file)
@@ -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" )
index 83e1d4822602b6f09ef3540c9c955bffbe48f985..f03c099022091b59e934500da948dac09e6db9c8 100644 (file)
@@ -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
index 2bac2e59460d6d4c766d74cdb5d4aa9d2eb3c2ab..c5ec277a24a371248d6a9de934230cc539f14f3c 100644 (file)
@@ -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[@]"