summaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
Diffstat (limited to 'kud')
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml2
-rw-r--r--kud/hosting_providers/vagrant/Vagrantfile2
-rwxr-xr-xkud/tests/_common.sh12
-rwxr-xr-xkud/tests/_functions.sh2
4 files changed, 10 insertions, 8 deletions
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index ffe12fce..8e4f3c4f 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -54,7 +54,7 @@ istio_url: "https://github.com/istio/istio/releases/download/{{ istio_version }}
go_path: "{{ base_dest }}/go"
ovn4nfv_dest: "{{ go_path }}/src/ovn4nfv-k8s-plugin"
ovn4nfv_source_type: "source"
-ovn4nfv_version: 5026d1d89b05eac5e004279b742df6745a73d93a
+ovn4nfv_version: aa14577f6bc672bc8622edada8a487825fdebce1
ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/"
go_version: '1.12.4'
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/tests/_common.sh b/kud/tests/_common.sh
index f0fa7d6f..77818dcf 100755
--- a/kud/tests/_common.sh
+++ b/kud/tests/_common.sh
@@ -33,7 +33,7 @@ rbp_instance=rbp_instance.json
rbp_content_tarball=profile.tar
# vFirewall vars
-demo_artifacts_version=1.3.0
+demo_artifacts_version=1.3.1
vfw_private_ip_0='192.168.10.3'
vfw_private_ip_1='192.168.20.2'
vfw_private_ip_2='10.10.100.3'
@@ -376,7 +376,7 @@ spec:
$proxy
runcmd:
$cloud_init_proxy
- - wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/tests/vFW/$packetgen_deployment_name | sudo -E bash
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/$packetgen_deployment_name | sudo -E bash
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
@@ -444,7 +444,7 @@ spec:
$proxy
runcmd:
$cloud_init_proxy
- - wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/tests/vFW/$firewall_deployment_name | sudo -E bash
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/$firewall_deployment_name | sudo -E bash
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
@@ -652,7 +652,7 @@ spec:
$proxy
runcmd:
$cloud_init_proxy
- - wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/tests/vFW/$packetgen_deployment_name | sudo -E bash
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/$packetgen_deployment_name | sudo -E bash
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
@@ -719,7 +719,7 @@ spec:
$proxy
runcmd:
$cloud_init_proxy
- - wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/tests/vFW/$firewall_deployment_name | sudo -E bash
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/$firewall_deployment_name | sudo -E bash
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
@@ -785,7 +785,7 @@ spec:
$proxy
runcmd:
$cloud_init_proxy
- - wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/tests/vFW/$sink_deployment_name | sudo -E bash
+ - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/$sink_deployment_name | sudo -E bash
VirtletSSHKeys: |
$ssh_key
VirtletRootVolumeSize: 5Gi
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'