From: Eric Tang <qcorba@gmail.com>
Date: Sun, 19 Apr 2020 01:48:24 +0000 (+0800)
Subject: Install criproxy binary in /usr/local/bin instead of /tmp.
X-Git-Tag: 0.6.0~6^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=86c469873be784ddee0cc2797113c98bd80dc290;p=multicloud%2Fk8s.git

Install criproxy binary in /usr/local/bin instead of /tmp.
Issue-ID: MULTICLOUD-1051

Signed-off-by: Eric Tang <qcorba@gmail.com>
Change-Id: I96443ee539de0e2a18011148f86f97e70634cae3
Signed-off-by: Eric Tang <qcorba@gmail.com>
---

diff --git a/kud/deployment_infra/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml
index 18d3740a..9874eb8f 100644
--- a/kud/deployment_infra/playbooks/configure-virtlet.yml
+++ b/kud/deployment_infra/playbooks/configure-virtlet.yml
@@ -207,11 +207,13 @@
           chdir: "{{ criproxy_dest }}"
       when: criproxy_source_type == "source"
     - name: download CRIproxy package
+      become: yes
       get_url:
         url: "{{ criproxy_url }}"
         dest: "{{ criproxy_dest }}/criproxy"
       when: criproxy_source_type == "binary"
     - name: set criproxy execution permissions
+      become: yes
       file:
         path: "{{ criproxy_dest }}/criproxy"
         mode: "+x"
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index a592a909..0fdfafeb 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -18,10 +18,11 @@ ovn_kubernetes_url: "https://github.com/openvswitch/ovn-kubernetes/archive/v{{ o
 #ovn_kubernetes_version: 456a0857956988f968bb08644c650ba826592ec1
 #ovn_kubernetes_url: "https://github.com/openvswitch/ovn-kubernetes"
 
-criproxy_dest: "{{ base_dest }}/criproxy"
+criproxy_dest: "/usr/local/bin"
 criproxy_source_type: "binary"
 criproxy_version: 0.14.0
 criproxy_url: "https://github.com/Mirantis/criproxy/releases/download/v{{ criproxy_version }}/criproxy"
+#criproxy_dest: "{{ base_dest }}/criproxy"
 #criproxy_source_type: "source"
 #criproxy_version: b5ca5a6cec278e2054dface4f7a3e111fb9ab84b
 #criproxy_url: "https://github.com/Mirantis/criproxy"