From 2f3f7d2deac93dbe5159ca9a32f0d31ce98d030f Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Fri, 8 Nov 2019 09:36:25 +0200
Subject: [PATCH] Update ansible script for packages to be executed with other
 users

---
 data/ansible/packages/main.yaml | 46 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/data/ansible/packages/main.yaml b/data/ansible/packages/main.yaml
index bcf383859..e85ca096d 100644
--- a/data/ansible/packages/main.yaml
+++ b/data/ansible/packages/main.yaml
@@ -187,7 +187,21 @@
         chdir: /var/packages/debian
       with_items: '{{ changesFileNames.stdout_lines }}'
 
-# Before moving the new package from apt we have to include the current deb as an older version and remove the current
+    # Move the file to PKG server
+    - name: Copy the file to PKG server
+      become: yes
+      shell: 'sudo sshpass -p "{{ pkgPass }}" scp /var/packages/debian/incoming/{{ item }} {{ gouser }}@{{ internalPkgAddr }}:/tmp/'
+      args:
+        chdir: /var/packages/debian/incoming/
+      with_items: '{{ debFileName.stdout_lines }}'
+
+    # Clean the incoming folder
+    - name: Clean the incoming folder
+      become: yes
+      shell: "sudo rm /var/packages/debian/incoming/*"
+      args:
+        chdir: /var/packages/debian
+
 - hosts: pkg
   remote_user: '{{ gouser }}'
   tasks:
@@ -195,32 +209,12 @@
       become: yes
       shell: "sudo rm /var/packages/debian/cgrates_current_amd64.deb"
 
-    - name: Move include the previos package as older version
+    - name: Move the new package to /var/packages/debian
       become: yes
-      shell: "sudo mv {{ internalPkgDir }}/* /var/packages/debian/"
+      shell: "sudo mv /tmp/{{ item}} /var/packages/debian/"
+      with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"
 
-- hosts: apt
-  remote_user: '{{ gouser }}'
-  tasks:
-    # Move the file to PKG server
-    - name : Copy the file to PKG server
+    - name: Create the new symlink cgrates_current_amd64.deb
       become: yes
-      shell: 'sudo sshpass -p "{{ pkgPass }}" scp /var/packages/debian/incoming/{{ item }} {{ gouser }}@{{ internalPkgAddr }}:{{ internalPkgDir }}'
-      args :
-        chdir: /var/packages/debian/incoming/
-      with_items: '{{ debFileName.stdout_lines }}'
-
-    # Clean the incoming folder
-    - name : Clean the incoming folder
-      become: yes
-      shell: "sudo rm /var/packages/debian/incoming/*"
-      args :
-        chdir: /var/packages/debian
-
-- hosts: pkg
-  remote_user: '{{ gouser }}'
-  tasks:
-    - name: Copy the new package and change it's name to cgrates_current_amd64.deb
-      become: yes
-      shell: "sudo ln -s {{ internalPkgDir }}/{{ item }} /var/packages/debian/cgrates_current_amd64.deb"
+      shell: "sudo ln -s /var/packages/debian/{{ item }} /var/packages/debian/cgrates_current_amd64.deb"
       with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"
\ No newline at end of file