Merge "Add License headers"

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

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index b4886f2..30683cb 100755 (executable)
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -140,7 +140,7 @@ function install_k8s {
 
     # Configure environment
     mkdir -p $HOME/.kube
-    mv $HOME/admin.conf $HOME/.kube/config
+    mv $krd_inventory_folder/artifacts/admin.conf $HOME/.kube/config
 }
 
 # install_addons() - Install Kubenertes AddOns
@@ -169,39 +169,24 @@ function install_plugin {
     _install_docker
     pip install docker-compose
 
-    mkdir -p /opt/{csar,kubeconfig,consul/config}
+    mkdir -p /opt/{kubeconfig,consul/config}
     cp $HOME/.kube/config /opt/kubeconfig/krd
-    export CSAR_DIR=/opt/csar
     export KUBE_CONFIG_DIR=/opt/kubeconfig
-    echo "export CSAR_DIR=${CSAR_DIR}" >> /etc/environment
     echo "export KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR}" >> /etc/environment
 
     GOPATH=$(go env GOPATH)
-    git clone https://git.onap.org/multicloud/k8s $GOPATH/src/k8-plugin-multicloud
     pushd $GOPATH/src/k8-plugin-multicloud/deployments
     ./build.sh
-    docker-compose up -d
-    popd
 
     if [[ -n "${testing_enabled+x}" ]]; then
+        docker-compose up -d
         pushd $krd_tests
-        bash plugin.sh
+        for functional_test in plugin plugin_edgex; do
+            bash ${functional_test}.sh
+        done
         popd
     fi
-}
-
-# _install_crictl() - Install Container Runtime Interface (CRI) CLI
-function _install_crictl {
-    local version="v1.0.0-alpha.0" # More info: https://github.com/kubernetes-incubator/cri-tools#current-status
-
-    wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$version/crictl-$version-linux-amd64.tar.gz
-    tar zxvf crictl-$version-linux-amd64.tar.gz -C /usr/local/bin
-    rm -f crictl-$version-linux-amd64.tar.gz
-
-    cat << EOL > /etc/crictl.yaml
-runtime-endpoint: unix:///run/criproxy.sock
-image-endpoint: unix:///run/criproxy.sock
-EOL
+    popd
 }
 
 # _print_kubernetes_info() - Prints the login Kubernetes information
@@ -210,10 +195,11 @@ function _print_kubernetes_info {
         return
     fi
     # Expose Dashboard using NodePort
+    node_port=30080
     KUBE_EDITOR="sed -i \"s|type\: ClusterIP|type\: NodePort|g\"" kubectl -n kube-system edit service kubernetes-dashboard
+    KUBE_EDITOR="sed -i \"s|nodePort\: .*|nodePort\: $node_port|g\"" kubectl -n kube-system edit service kubernetes-dashboard
 
     master_ip=$(kubectl cluster-info | grep "Kubernetes master" | awk -F ":" '{print $2}')
-    node_port=$(kubectl get service -n kube-system | grep kubernetes-dashboard | awk '{print $5}' |awk -F "[:/]" '{print $2}')
 
     printf "Kubernetes Info\n===============\n" > $k8s_info_file
     echo "Dashboard URL: https:$master_ip:$node_port" >> $k8s_info_file
@@ -222,7 +208,7 @@ function _print_kubernetes_info {
 }
 
 # Configuration values
-addons="virtlet ovn-kubernetes multus nfd"
+addons="virtlet ovn-kubernetes multus"
 krd_folder="$(dirname "$0")"
 verbose=""
 
@@ -258,6 +244,9 @@ krd_tests=$krd_folder/tests
 k8s_info_file=$krd_folder/k8s_info.log
 
 mkdir -p $log_folder
+mkdir -p /opt/csar
+export CSAR_DIR=/opt/csar
+echo "export CSAR_DIR=${CSAR_DIR}" >> /etc/environment
 
 # Install dependencies
 # Setup proxy variables