playbook: several improvements in re6stnet-upgrader.

playbook/roles/re6stnet-upgrader/files/key_2EB4D2F994A63987.gpg

------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE9rM7ARBACILnCus7kJJtRKskvLcQVl1/cIF241w1XSeK23HHn/lpKjNmQ8
-C6Uaqe4RI6aBMtJq7/9pcoq165Cz+fjW5xJYRdOTCJV+8gVCeXeJ1juAxZ2cU5NB
-uAJ/7rG9mu2WgtSO8s5O8Hihpmn8Z/xEnYn+Fh45lG3u9+Lkum/WMSJ+mwCg1Jw3
-P2T+dffvvWrZgvfacWz0uEMD/2M+2B9XJ0Ga4Z+yVuU57CvsaHJMGnPVnwsgCu8u
-KIvkawiOg/HzNgIj88yETu0Q8HhuwfbdusRfv22MGmxvqvLGDGUSkkzQ/bev2vSc
-fQAerKe2+BAV3QdPWhsVh2OTLEgDn7j+qewxih2+l6ASATs++6VX3JPuISKi5XMV
-1aAvA/4vyG9evJ6DlAxfd235t3LUsYSmzKa5/1Wv4bVfAQXism4oGS4vygaTFqs7
-tsBitWSmp+Jo7Fc7a5QRX/yL3uyDkXBB7NLPmYitFT5OvcdKg4U0fHigWxhzl8Xs
-GMQZrlokbwJ/JxLlB1xYmdotfEYCwMJYc9momYg21FvMPfFu9rRCaG9tZTpWSUZJ
-Qm5leGVkaSBPQlMgUHJvamVjdCA8aG9tZTpWSUZJQm5leGVkaUBidWlsZC5vcGVu
-c3VzZS5vcmc+iGYEExECACYFAlOMizICGwMFCQhAB4IGCwkIBwMCBBUCCAMEFgID
-AQIeAQIXgAAKCRAutNL5lKY5h3y4AJ4qgG9vVq7jPWW+oiFlO+xW9X7YrgCgs/oW
-2c0IgUcwyXKNlbSYqGyu0l2IRgQTEQIABgUCT2szsAAKCRA7MBG3a51lI7sdAJ9q
-/+6D3FndEZieHpJw/kG1eZLu/ACeKk0hcqg9zrFwj21oBr96kOBXCTs=
-=8ciq
------END PGP PUBLIC KEY BLOCK-----

playbook/roles/re6stnet-upgrader/tasks/debian.yml

@@ -8,11 +8,10 @@
     - apt_key:
             data: "{{ lookup('file', 'key_1A716324.gpg') }}"
 
-    - apt_key:
-            data: "{{ lookup('file', 'key_2EB4D2F994A63987.gpg') }}"
-
     - name: Purge old re6stnet package
       apt: name=re6stnet state=absent purge=yes
 
+    - include: fill_cache.yml
+
     - name: Install re6st-node package
       apt: name=re6st-node update_cache=yes state=latest

playbook/roles/re6stnet-upgrader/tasks/fill_cache.yml

+---
+    - copy:
+        src: re6st_db_create.sql
+        dest: /tmp/
+        owner: root
+        group: root
+        mode: 0644
+
+    - file: path=/var/lib/re6stnet owner=root group=root mode=0755 state=directory
+
+    - name: Create new cache
+      shell: sqlite3 /var/lib/re6stnet/cache.db < /tmp/re6st_db_create.sql && rm /tmp/re6st_db_create.sql
+
+    - name: Fill new cache
+      command: sqlite3 -noheader -csv /var/lib/re6stnet/cache.db ".import {{ export_csv.stdout }} peer"

playbook/roles/re6stnet-upgrader/tasks/main.yml

@@ -12,7 +12,7 @@
       when: ansible_os_family == "Centos" or ansible_os_family == "RedHat"
 
     - name: Dump cache
-      shell: sqlite3 -noheader -csv /var/lib/re6stnet/peers.db "select * from peer;" > {{ export_csv.stdout }} removes=/var/lib/re6stnet/peers.db 
+      shell: sqlite3 -noheader -csv /var/lib/re6stnet/peers.db "select * from peer;" > {{ export_csv.stdout }} removes=/var/lib/re6stnet/peers.db
 
     - include: debian.yml
       when: ansible_os_family == "Debian"
@@ -20,22 +20,4 @@
     - include: rhel.yml
       when: ansible_os_family == "Centos" or ansible_os_family == "RedHat"
 
-    - file: path=/var/lib/re6stnet owner=root group=root mode=0755 state=directory
-
-    - copy: 
-        src: re6st_db_create.sql
-        dest: /tmp/
-        owner: root
-        group: root
-        mode: 0644
-
-    - name: Create new cache
-      shell: sqlite3 /var/lib/re6stnet/cache.db < /tmp/re6st_db_create.sql && rm /tmp/re6st_db_create.sql
-
-    - name: Fill new cache
-      command: sqlite3 -noheader -csv /var/lib/re6stnet/cache.db ".import {{ export_csv.stdout }} peer" 
-
-    - name: Restart re6stnet service
-      service: name=re6stnet enabled=yes state=restarted
-
     - command: rm {{ export_csv.stdout }}

playbook/roles/re6stnet-upgrader/tasks/rhel.yml

@@ -10,5 +10,10 @@
     - name: Purge old re6stnet package
       yum: name=re6stnet state=absent
 
+    - include: fill_cache.yml
+
     - name: Install re6st-node package
       yum: name=re6st-node update_cache=yes state=latest
+
+    - name: Restart re6stnet service
+      service: name=re6stnet enabled=yes state=restarted