From a77fb4ec266a46e78406acfc0de89ff3487d6d38 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Mon, 28 Aug 2017 19:38:23 +0000
Subject: [PATCH] Prioritize tox environment executables for
 fullstack/functional tests

Otherwise tests will use executables from global paths (f.e. /usr/bin/)
when those are available, which doesn't play well with a system that has
devstack installed.

Change-Id: I3213d5cb570b09d5049b7087cd710337e2698eb3
---
 tools/deploy_rootwrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deploy_rootwrap.sh b/tools/deploy_rootwrap.sh
index 91d7d6b0c15..d1b1feec2ca 100755
--- a/tools/deploy_rootwrap.sh
+++ b/tools/deploy_rootwrap.sh
@@ -50,7 +50,7 @@ mkdir -p -m 755 ${dst_rootwrap_path}
 cp -p ${src_rootwrap_path}/* ${dst_rootwrap_path}/
 cp -p ${src_conf} ${dst_conf}
 sed -i "s:^filters_path=.*$:filters_path=${dst_rootwrap_path}:" ${dst_conf}
-sed -i "s:^\(exec_dirs=.*\)$:\1,${target_bin_path},${fullstack_path}:" ${dst_conf}
+sed -i "s:^exec_dirs=\(.*\)$:exec_dirs=${target_bin_path},${fullstack_path},\1:" ${dst_conf}
 
 if [[ "$OS_SUDO_TESTING" = "1" ]]; then
     sed -i 's/use_syslog=False/use_syslog=True/g' ${dst_conf}