From e5ba32d8fa13b784fc96b59886535a9e4601c3ff Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Wed, 6 Sep 2017 10:32:45 -0400
Subject: [PATCH] Install netaddr before running site.yml

Currently, the execution of site.yml fails as site.yml installs
python-netaddr in the same run as it uses it, which fails since
ansible-playbook can't see the newly installed module.

This commit simply removes python-netaddr from
mnaio_host_distro_packages and adds a new task to build.sh to
install it before site.yml is kicked off.

NOTE: This commit also switches to installing netaddr via pip
      instead of system package since that does not require pre-loading
      vars files depending on OS, etc.

Change-Id: I324ba61a860f5942b40972903ae1c40caa7839e5
---
 multi-node-aio/build.sh                  | 5 +++++
 multi-node-aio/playbooks/vars/ubuntu.yml | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh
index 974f9e40..f1a3ad58 100755
--- a/multi-node-aio/build.sh
+++ b/multi-node-aio/build.sh
@@ -19,6 +19,11 @@ source bootstrap.sh
 
 source ansible-env.rc
 
+ansible mnaio_hosts \
+        -i playbooks/inventory \
+        -m pip \
+        -a "name=netaddr"
+
 ansible-playbook -vv \
                  -i playbooks/inventory \
                  -e setup_host=${SETUP_HOST:-"true"} \
diff --git a/multi-node-aio/playbooks/vars/ubuntu.yml b/multi-node-aio/playbooks/vars/ubuntu.yml
index d556176c..6032785c 100644
--- a/multi-node-aio/playbooks/vars/ubuntu.yml
+++ b/multi-node-aio/playbooks/vars/ubuntu.yml
@@ -23,7 +23,6 @@ mnaio_host_distro_packages:
   - openssh-server
   - python2.7
   - python-software-properties
-  - python-netaddr
   - qemu-kvm
   - qemu-utils
   - software-properties-common