summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2018-09-18 05:45:15 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-18 05:45:15 +0000
commitbe88f0d19f136f8c5693d5fe93011936e7249eca (patch)
tree8fec3b11fc9f63aa1093b27af7ac7b95532c40aa
parenta2900c4ecc53e6132e6dd8353ebd312aa400b862 (diff)
parent52aa8149abbe8cb83fd121e13baf37285b20753a (diff)
Merge "Remove NFD from list of AddOns"
-rwxr-xr-xvagrant/installer.sh16
1 files changed, 1 insertions, 15 deletions
diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index f6f2f76a..5ac06513 100755
--- 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=""