Revert "openwrt naming scheme has changed"

This reverts commit c41f78ac71ef3a22009e655b58b88e2f7a120bfd.

1 files changed, 9 insertions, 9 deletions

diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/openwrt/image/tasks/fetch.yml
index 20d6475a..21bc0c40 100644
--- a/roles/openwrt/image/tasks/fetch.yml
+++ b/roles/openwrt/image/tasks/fetch.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create download directory
   file:
-    dest: "{{ openwrt_download_dir }}/{{ openwrt_release }}"
+    dest: "{{ openwrt_download_dir }}"
     state: directory
 
 - block:
@@ -13,38 +13,38 @@
     - name: Download sha256sums
       get_url:
         url: "{{ openwrt_url }}/sha256sums"
-        dest: "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256"
+        dest: "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256"
 
     - name: Download sha256sums.asc
       get_url:
         url: "{{ openwrt_url }}/sha256sums.asc"
-        dest: "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256.asc"
+        dest: "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc"
 
     - name: Check OpenPGP signature
       command: >-
         gpg2 --no-options --no-default-keyring --secret-keyring /dev/null
              --verify --keyring "{{ role_path }}/openwrt-keyring.gpg"
              --trust-model always
-             "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256.asc"
+             "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc"
       changed_when: False
 
     - name: Extract SHA256 hash of the imagebuilder archive
-      command: grep '{{ openwrt_tarball_name }}' "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256"
+      command: grep '{{ openwrt_tarball_name }}' "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256"
       register: sha256
       changed_when: False
 
     - name: Download imagebuilder
       get_url:
         url: "{{ openwrt_url }}/{{ openwrt_tarball_name }}"
-        dest: "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_name }}"
+        dest: "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
         checksum: sha256:{{ sha256.stdout.split(' ') | first }}
 
   rescue:
     - name: Delete downloaded artifacts
       loop:
-        - "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256"
-        - "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_basename }}.sha256.asc"
-        - "{{ openwrt_download_dir }}/{{ openwrt_release }}/{{ openwrt_tarball_name }}"
+        - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256"
+        - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc"
+        - "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
       file:
         path: "{{ item }}"
         state: absent