summaryrefslogtreecommitdiffstats
path: root/xci/files/xci-destroy-env.sh
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-23 10:01:47 +0000
committerMarkos Chandras <mchandras@suse.de>2018-03-23 16:02:35 +0000
commit434466fafd40485eefba1c59af105ecf793a3c25 (patch)
treecb3b3812baaa06f76a8a6b7ae1a32c3d0a374f40 /xci/files/xci-destroy-env.sh
parent88fc810539b0ecc6ffd74cd3de88de527221938c (diff)
xci: install: Move all pip installations to virtualenv
Now that all pip installations are managed in the same way we can move them inside a global virtual environment to further isolate the XCI artifacts from the rest of the system. Moreover, we further simplify the initial package installation to install everything at once instead of calling the package manager for every single package that we need. Change-Id: I6a170d2439fae8b0653f3141e0e8bb8ead67657e Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/files/xci-destroy-env.sh')
-rwxr-xr-xxci/files/xci-destroy-env.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/xci/files/xci-destroy-env.sh b/xci/files/xci-destroy-env.sh
index 8b811d0f..2e183bd7 100755
--- a/xci/files/xci-destroy-env.sh
+++ b/xci/files/xci-destroy-env.sh
@@ -23,7 +23,7 @@ rm -rf ${HOME}/.config/openstack
rm -rf ${HOME}/.ansible
# bifrost installs everything on venv so we need to look there if virtualbmc is not installed on the host.
-if which vbmc &>/dev/null || { [[ -e /opt/stack/bifrost/bin/activate ]] && source /opt/stack/bifrost/bin/activate; }; then
+if which vbmc &>/dev/null || { [[ -e ${XCI_VENV}/bifrost/bin/activate ]] && source ${XCI_VENV}/bifrost/bin/activate; }; then
# Delete all libvirt VMs and hosts from vbmc (look for a port number)
for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
if which virsh &>/dev/null; then
@@ -81,4 +81,6 @@ service ironic-api restart || true
service ironic-conductor start || true
service ironic-inspector restart || true
+rm -rf ${XCI_VENV}
+
# vim: set ts=4 sw=4 expandtab: