Starting of k8splugin with docker-compose is broken

[multicloud/k8s.git] / kud / hosting_providers / vagrant / installer.sh

diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index c17f89e..2168d0d 100755 (executable)
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -40,12 +40,13 @@ function _install_pip {
 
 # _install_ansible() - Install and Configure Ansible program
 function _install_ansible {
-    sudo mkdir -p /etc/ansible/
     if $(ansible --version &>/dev/null); then
-        return
+        sudo pip uninstall -y ansible
     fi
     _install_pip
-    sudo -E pip install ansible
+    local version=$(grep "ansible_version" ${kud_playbooks}/kud-vars.yml | awk -F ': ' '{print $2}')
+    sudo mkdir -p /etc/ansible/
+    sudo -E pip install ansible==$version
 }
 
 # _install_docker() - Download and install docker-engine
@@ -78,7 +79,6 @@ function _install_docker {
     echo "DOCKER_OPTS=\"-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --max-concurrent-downloads $max_concurrent_downloads \"" | sudo tee --append /etc/default/docker
     if [[ -z $(groups | grep docker) ]]; then
         sudo usermod -aG docker $USER
-        newgrp docker
     fi
 
     sudo systemctl restart docker
@@ -166,7 +166,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
@@ -216,7 +216,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}