Merge "Refactor installers support code"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Wed, 14 Dec 2016 02:51:31 +0000 (02:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 14 Dec 2016 02:51:31 +0000 (02:51 +0000)
1  2 
tests/run.sh

diff --cc 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"