From 8e175252d6fa7a4294e22c60dd30ff4f739ff348 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 10 Aug 2017 16:13:05 -0500
Subject: [PATCH] Move v2 os-net-config call to where it is actually available

Until the undercloud is installed os-net-config isn't there.
---
 bin/ovb-instack | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/bin/ovb-instack b/bin/ovb-instack
index b0f981f..9919a85 100755
--- a/bin/ovb-instack
+++ b/bin/ovb-instack
@@ -22,18 +22,6 @@ echo 'git-tripleo-ci/scripts/tripleo.sh $@' >> tripleo.sh
 chmod +x tripleo.sh
 git clone https://github.com/cybertron/openstack-virtual-baremetal
 
-cat >> /tmp/eth2.cfg <<EOF_CAT
-network_config:
-    - type: interface
-      name: eth2
-      use_dhcp: false
-      addresses:
-        - ip_netmask: 10.0.0.1/24
-        - ip_netmask: 2001:db8:fd00:1000::1/64
-EOF_CAT
-sudo os-net-config -c /tmp/eth2.cfg -v
-sudo iptables -A POSTROUTING -s 10.0.0.0/24 ! -d 10.0.0.0/24 -j MASQUERADE -t nat
-
 export OVERCLOUD_PINGTEST_OLD_HEATCLIENT=0
 export TRIPLEOSH=/home/centos/tripleo.sh
 
@@ -54,6 +42,19 @@ EOF
 # Workaround until https://review.openstack.org/#/c/475533 merges
 export OVB=0
 $TRIPLEOSH --undercloud
+
+cat >> /tmp/eth2.cfg <<EOF_CAT
+network_config:
+    - type: interface
+      name: eth2
+      use_dhcp: false
+      addresses:
+        - ip_netmask: 10.0.0.1/24
+        - ip_netmask: 2001:db8:fd00:1000::1/64
+EOF_CAT
+sudo os-net-config -c /tmp/eth2.cfg -v
+sudo iptables -A POSTROUTING -s 10.0.0.0/24 ! -d 10.0.0.0/24 -j MASQUERADE -t nat
+
 $TRIPLEOSH --overcloud-images
 $TRIPLEOSH --register-nodes --introspect-nodes
 sleep 60