Remove NFD from list of AddOns

The Node Feature Discovery AddOn has been included as part of the
capabilities supported by the KRD but it has been detected some
issues when its services are trying to start. Given that this feature
is not necessary for this phase it can be excluded from the default
list.

The _install_crictl function is not consumed by any other method,
this also includes its removal.

Change-Id: I771a8865894038b91324a9cb3797c2197666f480
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-301

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index f6f2f76..5ac0651 100755 (executable)
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -187,20 +187,6 @@ function install_plugin {
     popd
 }
 
-# _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
-}
-
 # _print_kubernetes_info() - Prints the login Kubernetes information
 function _print_kubernetes_info {
     if ! $(kubectl version &>/dev/null); then
@@ -219,7 +205,7 @@ function _print_kubernetes_info {
 }
 
 # Configuration values
-addons="virtlet ovn-kubernetes multus nfd"
+addons="virtlet ovn-kubernetes multus"
 krd_folder="$(dirname "$0")"
 verbose=""