aboutsummaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
Diffstat (limited to 'kud')
-rwxr-xr-xkud/deployment_infra/playbooks/install_iavf_drivers.sh2
-rw-r--r--kud/deployment_infra/playbooks/sriov_hardware_check.sh10
-rw-r--r--kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml1
-rw-r--r--kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml1
-rwxr-xr-xkud/hosting_providers/vagrant/setup.sh3
-rwxr-xr-xkud/tests/topology-manager.sh3
6 files changed, 8 insertions, 12 deletions
diff --git a/kud/deployment_infra/playbooks/install_iavf_drivers.sh b/kud/deployment_infra/playbooks/install_iavf_drivers.sh
index 7a54e9f2..dd01b062 100755
--- a/kud/deployment_infra/playbooks/install_iavf_drivers.sh
+++ b/kud/deployment_infra/playbooks/install_iavf_drivers.sh
@@ -3,7 +3,7 @@
# Based on:
# https://gerrit.akraino.org/r/#/c/icn/+/1359/1/deploy/kud-plugin-addons/device-plugins/sriov/driver/install_iavf_drivers.sh
-nic_models=(XL710 X722)
+nic_models=(X710 XL710 X722)
nic_drivers=(i40e)
device_checkers=(is_not_used is_driver_match is_model_match)
diff --git a/kud/deployment_infra/playbooks/sriov_hardware_check.sh b/kud/deployment_infra/playbooks/sriov_hardware_check.sh
index 662c28c8..980fef67 100644
--- a/kud/deployment_infra/playbooks/sriov_hardware_check.sh
+++ b/kud/deployment_infra/playbooks/sriov_hardware_check.sh
@@ -12,14 +12,8 @@ set -o pipefail
source /etc/environment
-ethernet_adpator_version=$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 )
-if [ -z "$ethernet_adpator_version" ]; then
- echo "False"
- exit 0
-fi
-SRIOV_ENABLED=${ethernet_adpator_version:-"false"}
-#checking for the right hardware version of NIC on the machine
-if [ "$ethernet_adpator_version" == "XL710" ]; then
+adaptors="X710 XL710 X722"
+if [[ $(lspci | grep -c "Ethernet .* \(${adaptors// /\\|}\)") != "0" ]]; then
echo "True"
else
echo "False"
diff --git a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
index 18a55035..30e8bc42 100644
--- a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
@@ -51,6 +51,7 @@ local_volume_provisioner_enabled: true
# Helm deployment
helm_enabled: true
+helm_stable_repo_url: "https://charts.helm.sh/stable"
# Kube-proxy proxyMode configuration.
# NOTE: Ipvs is based on netfilter hook function, but uses hash table as the underlying data structure and
diff --git a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
index 5b06b788..8d4795be 100644
--- a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -52,6 +52,7 @@ local_volume_provisioner_enabled: true
# Helm deployment
helm_enabled: true
+helm_stable_repo_url: "https://charts.helm.sh/stable"
# Kube-proxy proxyMode configuration.
# NOTE: Ipvs is based on netfilter hook function, but uses hash table as the underlying data structure and
diff --git a/kud/hosting_providers/vagrant/setup.sh b/kud/hosting_providers/vagrant/setup.sh
index db6a732c..7251872a 100755
--- a/kud/hosting_providers/vagrant/setup.sh
+++ b/kud/hosting_providers/vagrant/setup.sh
@@ -11,7 +11,7 @@
set -o nounset
set -o pipefail
-vagrant_version=2.2.4
+vagrant_version=2.2.14
if ! vagrant version &>/dev/null; then
enable_vagrant_install=true
else
@@ -94,7 +94,6 @@ case ${ID,,} in
;;
ubuntu|debian)
- libvirt_group="libvirtd"
INSTALLER_CMD="sudo -H -E apt-get -y -q=3 install"
packages+=(python-dev)
diff --git a/kud/tests/topology-manager.sh b/kud/tests/topology-manager.sh
index 7d434386..5c9f900d 100755
--- a/kud/tests/topology-manager.sh
+++ b/kud/tests/topology-manager.sh
@@ -15,7 +15,8 @@ set -o pipefail
source _common.sh
source _functions.sh
-if [ -z "$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 )" ]; then
+adaptors="X710 XL710 X722"
+if [[ $(lspci | grep -c "Ethernet .* \(${adaptors// /\\|}\)") == "0" ]]; then
echo "Ethernet adaptor version is not set. Topology manager test case cannot run on this machine"
exit 0
else