Feat(fetch-push): Allow plain directory

Allow to omit hostname directory.

diff --git a/playbooks/fetch-push/fetch.yaml b/playbooks/fetch-push/fetch.yaml
index b2f20c862425215a7a9ae49fd56ef65a8646e538..59214cb00aaf39128c3643df9d407bd7423832c6 100644 (file)
--- a/playbooks/fetch-push/fetch.yaml
+++ b/playbooks/fetch-push/fetch.yaml
@@ -5,6 +5,6 @@
     - name: Fetch files
       fetch:
         src: "{{ item }}"
-        dest: "{{ start_dir }}/{{ inventory_hostname }}/"
+        dest: "{{ start_dir }}/{% if not plain_dir %}{{ inventory_hostname }}/{% endif %}"
         flat: yes
       loop: "{{ files.split(',') }}"

diff --git a/playbooks/fetch-push/push.yaml b/playbooks/fetch-push/push.yaml
index b2ad0e2062760f8e73d33a98fecb7670072a6683..35379b6f1533e381069ab48139e8e8b6e6b2eabe 100644 (file)
--- a/playbooks/fetch-push/push.yaml
+++ b/playbooks/fetch-push/push.yaml
@@ -5,7 +5,7 @@
   tasks:
     - name: Copy files
       copy:
-        src: "{{ start_dir }}/{{ inventory_hostname }}/{{ item }}"
+        src: "{{ start_dir }}/{% if not plain_dir %}{{ inventory_hostname }}/{% endif %}{{ item }}"
         dest: "{{ dest_dir }}/"
         owner: "{{ owner | default('root') }}"
         group: "{{ group | default('root') }}"