From 16ed2344971fd94008c19a6e98b2fc90fd4b0604 Mon Sep 17 00:00:00 2001
From: Pawel Kaminski <pawelx.kaminski@intel.com>
Date: Mon, 5 Aug 2019 10:45:05 -0400
Subject: [PATCH] test/openstack: Fix. Assign nvmfpid var as it is used in
 nvmftestfini

Change-Id: Id56b5034d034190f518bfa6cf84ec52a27a3ff5a
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464187
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/openstack/run_openstack_tests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/openstack/run_openstack_tests.sh b/test/openstack/run_openstack_tests.sh
index 7ed4b10c3..e11c7a00d 100755
--- a/test/openstack/run_openstack_tests.sh
+++ b/test/openstack/run_openstack_tests.sh
@@ -12,7 +12,7 @@ nvmftestinit
 function finish_test {
 	$rpc_py destroy_lvol_store -l lvs0
 	kill -9 $rpc_proxy_pid
-	killprocess $spdk_tgt_pid
+	killprocess $nvmfpid
 	rm $testdir/conf.json
 }
 
@@ -21,8 +21,8 @@ trap "finish_test" SIGINT SIGTERM EXIT
 timing_enter run_spdk_tgt
 $rootdir/scripts/gen_nvme.sh >> $testdir/conf.json
 $rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 1024 -c $testdir/conf.json &
-spdk_tgt_pid=$!
-waitforlisten $spdk_tgt_pid
+nvmfpid=$!
+waitforlisten $nvmfpid
 $rpc_py set_bdev_nvme_hotplug -e
 timing_exit run_spdk_tgt