From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Wed, 14 Dec 2016 02:51:31 +0000 (+0000)
Subject: Merge "Refactor installers support code"
X-Git-Tag: danube.1.RC1~36
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=doctor.git;a=commitdiff_plain;h=40cba233d16e355b078e368772ad4aadbb5f91b1

Merge "Refactor installers support code"
---

40cba233d16e355b078e368772ad4aadbb5f91b1
diff --cc tests/run.sh
index b6bfc0ba,141d836a..f1087baf
--- a/tests/run.sh
+++ b/tests/run.sh
@@@ -413,9 -277,10 +269,9 @@@ start_consumer() 
  stop_consumer() {
      pgrep -f "python consumer.py" || return 0
      kill $(pgrep -f "python consumer.py")
 -    print_log consumer.log
  
      # NOTE(r-mibu): terminate tunnels to the controller nodes
-     if [[ "$INSTALLER_TYPE" != "local" ]] ; then
+     if ! is_installer local; then
          for ip in $CONTROLLER_IPS
          do
              forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT"