summaryrefslogtreecommitdiffstats
path: root/xci/xci-deploy.sh
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-09-19 11:43:35 +0100
committerMarkos Chandras <mchandras@suse.de>2017-09-21 21:51:43 +0100
commit17d10d8b39a4475ea7faa0f59151f9edd278d9f0 (patch)
treef48b78d103cbe226e349482ed7a0912bacb567af /xci/xci-deploy.sh
parent669e79ad41b59ec3901642cf0533e71ae412d589 (diff)
xci: xci-deploy.sh: Ensure env_reset is not present
We are making use of 'sudo -E' to preserve environment variables when using 'sudo' so we need to make sure that we don't use env_reset in the configuration file. Change-Id: I45a818da6c5c090ece67898e54f2dc4ba48cb452 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-xxci/xci-deploy.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 78194fbe..c985c7dd 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -114,6 +114,8 @@ fi
#-------------------------------------------------------------------------------
echo "Info: Starting provisining VM nodes using openstack/bifrost"
echo "-------------------------------------------------------------------------"
+# We are using sudo so we need to make sure that env_reset is not present
+sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers
cd $XCI_PATH/../bifrost/
sudo -E bash ./scripts/destroy-env.sh
cd $XCI_PATH/playbooks