Merge "Removing _l3 from Apex scenario names in master"

[releng.git] / jjb / xci / xci-provision.sh

diff --git a/jjb/xci/xci-provision.sh b/jjb/xci/xci-provision.sh
index a1ba78b..47a9676 100755 (executable)
--- a/jjb/xci/xci-provision.sh
+++ b/jjb/xci/xci-provision.sh
@@ -38,7 +38,7 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
 fi
 
 # remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/stack /opt/releng /opt/functest
+sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest
 
 # Fix up permissions
 fix_ownership
@@ -86,7 +86,7 @@ sudo -E ./scripts/destroy-env.sh
 
 # provision 6 VMs; xcimaster, controller00, controller01, controller02, compute00, and compute01
 cd /opt/bifrost
-sudo -E ./scripts/osa-bifrost-deployment.sh
+sudo -E ./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
 cd /opt/bifrost