2 files changed, 9 insertions, 14 deletions
diff --git a/kud/hosting_providers/vagrant/aio.sh b/kud/hosting_providers/baremetal/aio.sh
index 0d06cc65..416a1fef 100755
--- a/kud/hosting_providers/vagrant/aio.sh
+++ b/kud/hosting_providers/baremetal/aio.sh
@@ -12,15 +12,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [[ $(whoami) != 'root' ]];then
-    echo "This bash script must be executed as root user"
-    exit 1
-fi
-
-echo "Cloning and configuring KUD project..."
-rm -rf k8s
-git clone https://git.onap.org/multicloud/k8s/
-cd k8s/kud/hosting_providers/baremetal/
+aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+cd ${aio_dir}/../vagrant
+
 cat <<EOL > inventory/hosts.ini
 [all]
 localhost
@@ -47,14 +41,14 @@ localhost
 kube-node
 kube-master
 EOL
-sed -i '/andrewrothstein.kubectl/d' ../../deployment_infra/playbooks/configure-*.yml
+
 rm -f ~/.ssh/id_rsa
 echo -e "\n\n\n" | ssh-keygen -t rsa -N ""
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 chmod og-wx ~/.ssh/authorized_keys
 
 echo "Enabling nested-virtualization"
-./node.sh
+sudo ./node.sh
 
-echo "Deploying KRD project"
+echo "Deploying KUD project"
 ./installer.sh | tee kud_installer.log
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index 277ff0ce..708e51e2 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -171,7 +171,7 @@ function install_plugin {
     pushd $kud_folder/../../../deployments
     sudo ./build.sh
     if [[ "${testing_enabled}" == "true" ]]; then
-        docker-compose up -d
+        sudo ./start.sh
         pushd $kud_tests
         for functional_test in plugin plugin_edgex; do
             bash ${functional_test}.sh
@@ -199,6 +199,7 @@ function _print_kubernetes_info {
     echo "Admin password: secret" >> $k8s_info_file
 }
 
+sudo -k # forgot sudo password
 if ! sudo -n "true"; then
     echo ""
     echo "passwordless sudo is needed for '$(id -nu)' user."
@@ -221,7 +222,7 @@ kud_infra_folder=$kud_folder/../../deployment_infra
 export kud_inventory_folder=$kud_folder/inventory
 kud_inventory=$kud_inventory_folder/hosts.ini
 kud_playbooks=$kud_infra_folder/playbooks
-kud_tests=$kud_folder/tests
+kud_tests=$kud_folder/../../tests
 k8s_info_file=$kud_folder/k8s_info.log
 testing_enabled=${KUD_ENABLE_TESTS:-false}