From 9a91ef8628b41194a25fbc821563f6b9d658dc82 Mon Sep 17 00:00:00 2001
From: hikoz <t@fo.x0.to>
Date: Tue, 12 Feb 2019 07:21:38 +0900
Subject: [PATCH] change permission after unarchive (#4191)
---
roles/network_plugin/calico/tasks/install.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index 0d0cad250..e4eed81dc 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -33,6 +33,13 @@
group: root
changed_when: false
+- name: Calico | Copy cni plugins
+ unarchive:
+ src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz"
+ dest: "/opt/cni/bin"
+ mode: 0755
+ remote_src: yes
+
- name: Calico | Set cni directory permissions
file:
path: /opt/cni/bin
@@ -41,13 +48,6 @@
recurse: true
mode: 0755
-- name: Calico | Copy cni plugins
- unarchive:
- src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz"
- dest: "/opt/cni/bin"
- mode: 0755
- remote_src: yes
-
- name: Calico | Copy cni plugins from calico/cni container
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp /opt/cni/bin/* /cnibindir/'"
register: cni_task_result
--
GitLab