From 96a821c48b7de0017d00c43a3f9da91585873354 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 30 May 2017 10:10:09 -0700
Subject: [PATCH] tests: use devstack-gate to deploy dstat for
 functional/fullstack

This should help with a gate failure where IPV4_ADDRS_SAFE_TO_USE would
not be honoured by devstack, rendering a job failed on a particular
cloud (like citycloud), like:

'Could not determine host ip address. See local.conf for suggestions on
setting HOST_IP.'

Closes-Bug: #1693689
Change-Id: Iee7cc4c129e6e9eab91107fda92f66c5379d6f95
---
 neutron/tests/contrib/gate_hook.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index 20690c9d86c..b760e6eacd0 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -81,12 +81,6 @@ case $VENV in
 
     # enable monitoring
     load_rc_hook dstat
-
-    # Make the workspace owned by the stack user
-    sudo chown -R $STACK_USER:$STACK_USER $BASE
-
-    # deploy devstack as per local.conf
-    cd $DEVSTACK_PATH && sudo -H -u $GATE_STACK_USER ./stack.sh
     ;;
 
 "api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
@@ -120,18 +114,16 @@ case $VENV in
     if [[ "$FLAVOR" = "dvrskip" ]]; then
         load_conf_hook disable_dvr
     fi
-
-    export DEVSTACK_LOCALCONF=$(cat $LOCAL_CONF)
-    $BASE/new/devstack-gate/devstack-vm-gate.sh
     ;;
 
 "rally")
     load_rc_for_rally
-    export DEVSTACK_LOCALCONF=$(cat $LOCAL_CONF)
-    $BASE/new/devstack-gate/devstack-vm-gate.sh
     ;;
 
 *)
     echo "Unrecognized environment $VENV".
     exit 1
 esac
+
+export DEVSTACK_LOCALCONF=$(cat $LOCAL_CONF)
+$BASE/new/devstack-gate/devstack-vm-gate.sh