summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2019-07-02 08:50:50 +0200
committerKonrad Bańka <k.banka@samsung.com>2019-08-01 13:00:56 +0200
commit8499197a5d7a33834774d2e95842702371d91040 (patch)
tree71a0d9aef323640d7ccb528076e571d8466051bf
parent09dffa6d151b046a87edcb91a46449cabc66532c (diff)
Correct go version installed by k8s addons
Andrewrothstein.go galaxy role, that was responsible for go installation was in too old tag to support demanded (1.12.4) go version. It also blocked ovn-kubernetes addon installation that's fixed now. Go version has been also upgraded to 1.12.5 Issue-ID: MULTICLOUD-644 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I926bd061a361b2ae2efa2aecedf4fa6321f04cc8
-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