summaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-08-05 07:20:23 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-05 07:20:23 +0000
commit4fb6acf5a720a0554c08a6f1d3526271b6317cdb (patch)
treec7e2e8bafa5c178430d7af901543876e48f3a06b /kud
parentd18501a4c4b15ee99e600ec6a5385616021812b4 (diff)
parent8499197a5d7a33834774d2e95842702371d91040 (diff)
Merge "Correct go version installed by k8s addons"
Diffstat (limited to 'kud')
-rw-r--r--kud/deployment_infra/galaxy-requirements.yml2
-rw-r--r--kud/deployment_infra/playbooks/configure-ovn4nfv.yml8
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml4
3 files changed, 8 insertions, 6 deletions
diff --git a/kud/deployment_infra/galaxy-requirements.yml b/kud/deployment_infra/galaxy-requirements.yml
index 093dec87..17ac1dc2 100644
--- a/kud/deployment_infra/galaxy-requirements.yml
+++ b/kud/deployment_infra/galaxy-requirements.yml
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
- src: andrewrothstein.go
- version: v2.1.10
+ version: v2.1.15
- src: andrewrothstein.kubernetes-helm
version: v1.2.9
- src: geerlingguy.docker
diff --git a/kud/deployment_infra/playbooks/configure-ovn4nfv.yml b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
index 2d1a11d0..2084c95d 100644
--- a/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
+++ b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
@@ -13,12 +13,14 @@
- hosts: kube-master:kube-node
environment:
PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/"
- roles:
- - role: andrewrothstein.go
- tasks:
+ pre_tasks:
- name: Load kud variables
include_vars:
file: kud-vars.yml
+ roles:
+ - role: andrewrothstein.go
+ go_ver: "{{ go_version }}"
+ tasks:
- name: clone ovn4nfv-k8s-plugin repo
git:
repo: "{{ ovn4nfv_url }}"
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index b11672f3..9b365477 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -54,10 +54,10 @@ 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: aa14577f6bc672bc8622edada8a487825fdebce1
+ovn4nfv_version: adc7b2d430c44aa4137ac7f9420e14cfce3fa354
ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/"
-go_version: '1.12.4'
+go_version: '1.12.5'
kubespray_version: 2.8.2
helm_client_version: 2.9.1
# kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634