summaryrefslogtreecommitdiffstats
path: root/kud/deployment_infra
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-04-23 02:02:25 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-23 02:02:25 +0000
commitce36e99a466993bdbbfba8a235db52e565da3340 (patch)
treeadbe25911900d4278d05e87584f0dad296663f03 /kud/deployment_infra
parent5414c23063815207c68bfc7398561cec7409c963 (diff)
parenta0a8f025b3a3a4dca0b31731d11d5dfeffcc3d69 (diff)
Merge "Updating Multus to v3.3-tp"
Diffstat (limited to 'kud/deployment_infra')
-rw-r--r--kud/deployment_infra/playbooks/configure-multus.yml7
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml12
2 files changed, 12 insertions, 7 deletions
diff --git a/kud/deployment_infra/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml
index 1f6d6ce9..91da8746 100644
--- a/kud/deployment_infra/playbooks/configure-multus.yml
+++ b/kud/deployment_infra/playbooks/configure-multus.yml
@@ -54,7 +54,12 @@
dest: "{{ multus_dest }}"
remote_src: yes
- name: copy multus binary to opt folder
- command: "mv {{ multus_dest }}/multus-cni_v{{ multus_version }}_linux_amd64/multus-cni /opt/cni/bin/multus"
+ command: "mv {{ multus_dest }}/multus-cni_{{ multus_version }}_linux_amd64/multus-cni /opt/cni/bin/multus"
+ - file:
+ path: /opt/cni/bin/multus
+ owner: root
+ group: root
+ mode: 0755
when: multus_source_type == "tarball"
- name: create multus configuration file
blockinfile:
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index d6bd0ee6..89ade0ee 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -11,12 +11,12 @@
base_dest: /tmp
multus_dest: "{{ base_dest }}/multus-cni"
-#multus_source_type: "tarball"
-#multus_version: 3.1
-#multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_v{{ multus_version }}_linux_amd64.tar.gz"
-multus_source_type: "source"
-multus_version: 366f2120cb88c85deab6343b7062fd38fdb0ece9
-multus_url: "https://github.com/ritusood/multus-cni"
+multus_source_type: "tarball"
+multus_version: 3.3-tp
+multus_url: "https://github.com/intel/multus-cni/releases/download/v{{ multus_version }}/multus-cni_{{ multus_version }}_linux_amd64.tar.gz"
+#multus_source_type: "source"
+#multus_version: 366f2120cb88c85deab6343b7062fd38fdb0ece9
+#multus_url: "https://github.com/ritusood/multus-cni"
ovn_kubernetes_dest: "{{ base_dest }}/ovn-kubernetes"
ovn_kubernetes_source_type: "tarball"