Enable installer.sh to use --plugins emco in place of onap4k8s.

Issue-ID: MULTICLOUD-1181
Signed-off-by: Todd <todd.malsbary@intel.com>
Change-Id: Ibfdf401d40398bf6b94543dedf4c860951d50de7

diff --git a/kud/hosting_providers/containerized/installer.sh b/kud/hosting_providers/containerized/installer.sh
index 5e46d96..45608a5 100755 (executable)
--- a/kud/hosting_providers/containerized/installer.sh
+++ b/kud/hosting_providers/containerized/installer.sh
@@ -131,27 +131,20 @@ function install_addons {
         for addon in ${KUD_ADDONS:-virtlet ovn4nfv nfd sriov cmk $plugins_name}; do
             pushd $kud_tests
             bash ${addon}.sh
+            case $addon in
+                "onap4k8s" )
+                    echo "Test the onap4k8s plugin installation"
+                    for functional_test in plugin_edgex plugin_fw plugin_eaa; do
+                        bash ${functional_test}.sh --external
+                    done
+                    ;;
+            esac
             popd
         done
     fi
     echo "Add-ons deployment complete..."
 }
 
-# install_plugin() - Install ONAP Multicloud Kubernetes plugin
-function install_plugin {
-    echo "Installing multicloud/k8s onap4k8s plugin"
-    if [[ "${testing_enabled}" == "true" ]]; then
-        pushd $kud_tests
-        echo "Test the onap4k8s installation"
-        bash onap4k8s.sh
-        echo "Test the onap4k8s plugin installation"
-        for functional_test in plugin_edgex plugin_fw plugin_eaa; do
-            bash ${functional_test}.sh --external
-        done
-        popd
-    fi
-}
-
 # _print_kubernetes_info() - Prints the login Kubernetes information
 function _print_kubernetes_info {
     if ! $(kubectl version &>/dev/null); then
@@ -207,12 +200,8 @@ function install_cluster {
     else
         install_addons
     fi
-
     echo "installed the addons"
-    if ${KUD_PLUGIN_ENABLED:-false}; then
-        install_plugin
-        echo "installed the install_plugin"
-    fi
+
     _print_kubernetes_info
 }