diff options
Diffstat (limited to 'kud')
| -rw-r--r-- | kud/deployment_infra/playbooks/kud-vars.yml | 2 | ||||
| -rw-r--r-- | kud/hosting_providers/vagrant/Vagrantfile | 2 | ||||
| -rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 6 | ||||
| -rwxr-xr-x | kud/tests/_functions.sh | 2 | ||||
| -rwxr-xr-x | kud/tests/multus.sh | 10 | ||||
| -rwxr-xr-x | kud/tests/ovn4nfv.sh | 7 |
6 files changed, 18 insertions, 11 deletions
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml index d49c3b73..8e4f3c4f 100644 --- a/kud/deployment_infra/playbooks/kud-vars.yml +++ b/kud/deployment_infra/playbooks/kud-vars.yml @@ -57,7 +57,7 @@ ovn4nfv_source_type: "source" ovn4nfv_version: aa14577f6bc672bc8622edada8a487825fdebce1 ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/" -go_version: '1.11' +go_version: '1.12.4' kubespray_version: 2.8.2 kubectl_version: 1.12.2 helm_client_version: 2.9.1 diff --git a/kud/hosting_providers/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile index 83ac68c2..d068b84a 100644 --- a/kud/hosting_providers/vagrant/Vagrantfile +++ b/kud/hosting_providers/vagrant/Vagrantfile @@ -120,7 +120,7 @@ Vagrant.configure("2") do |config| installer.vm.network :private_network, :ip => "10.10.10.2", :type => :static installer.vm.synced_folder '../../../', '/home/vagrant/multicloud-k8s/', type: sync_type installer.vm.provision 'shell', privileged: false do |sh| - sh.env = {'KUD_PLUGIN_ENABLED': 'true'} + sh.env = {'KUD_PLUGIN_ENABLED': 'false'} sh.inline = <<-SHELL cp /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index dd27e05f..c17f89e8 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -31,10 +31,10 @@ function _install_go { # _install_pip() - Install Python Package Manager function _install_pip { if $(pip --version &>/dev/null); then + sudo -E pip install --upgrade pip + else sudo apt-get install -y python-dev curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python - else - sudo -E pip install --upgrade pip fi } @@ -234,7 +234,7 @@ fi sudo apt-get update install_k8s install_addons -if [[ "${KUD_PLUGIN_ENABLED:-false}" ]]; then +if ${KUD_PLUGIN_ENABLED:-false}; then install_plugin fi _print_kubernetes_info diff --git a/kud/tests/_functions.sh b/kud/tests/_functions.sh index c25d1f2f..5efb56fe 100755 --- a/kud/tests/_functions.sh +++ b/kud/tests/_functions.sh @@ -12,6 +12,8 @@ set -o errexit set -o nounset set -o pipefail +source /etc/environment + function print_msg { local msg=$1 local RED='\033[0;31m' diff --git a/kud/tests/multus.sh b/kud/tests/multus.sh index 859fa3bb..2cff84bd 100755 --- a/kud/tests/multus.sh +++ b/kud/tests/multus.sh @@ -29,12 +29,14 @@ setup $multus_deployment_name deployment_pod=$(kubectl get pods | grep $multus_deployment_name | awk '{print $1}') echo "===== $deployment_pod details =====" kubectl exec -it $deployment_pod -- ip a -multus_nic=$(kubectl exec -it $deployment_pod -- ifconfig | grep "eth1") -if [ -z "$multus_nic" ]; then - echo "The $deployment_pod pod doesn't contain the eth1 nic" +multus_nic=$(kubectl exec -it $deployment_pod -- ip a) +if [[ $multus_nic != *"net1"* ]]; then + echo "The $deployment_pod pod doesn't contain the net1 nic" exit 1 +else + echo "Test Completed!" fi -popd # Teardown teardown $multus_deployment_name +popd diff --git a/kud/tests/ovn4nfv.sh b/kud/tests/ovn4nfv.sh index 37fddfd8..de8631f4 100755 --- a/kud/tests/ovn4nfv.sh +++ b/kud/tests/ovn4nfv.sh @@ -33,10 +33,13 @@ setup $ovn4nfv_deployment_name deployment_pod=$(kubectl get pods | grep $ovn4nfv_deployment_name | awk '{print $1}') echo "===== $deployment_pod details =====" kubectl exec -it $deployment_pod -- ip a -multus_nic=$(kubectl exec -it $deployment_pod -- ifconfig | grep "net1") -if [ -z "$multus_nic" ]; then + +ovn_nic=$(kubectl exec -it $deployment_pod -- ip a ) +if [[ $ovn_nic != *"net1"* ]]; then echo "The $deployment_pod pod doesn't contain the net1 nic" exit 1 +else + echo "Test Completed!" fi # Teardown |