move openwrt keyring file to common location

12 files changed, 26 insertions, 3 deletions

diff --git a/chaos-at-home/ch-ap.yml b/chaos-at-home/ch-ap.yml
index 1d3c8903..5dcb5ea2 100644
--- a/chaos-at-home/ch-ap.yml
+++ b/chaos-at-home/ch-ap.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: chaos-at-home-ap
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/chaos-at-home/ch-router.yml b/chaos-at-home/ch-router.yml
index f61feb15..6543ce8c 100644
--- a/chaos-at-home/ch-router.yml
+++ b/chaos-at-home/ch-router.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: ch-router
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/chaos-at-home/mz-ap.yml b/chaos-at-home/mz-ap.yml
index ccae1763..869f051d 100644
--- a/chaos-at-home/mz-ap.yml
+++ b/chaos-at-home/mz-ap.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: mz-ap
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/chaos-at-home/mz-router.yml b/chaos-at-home/mz-router.yml
index 301da764..94646991 100644
--- a/chaos-at-home/mz-router.yml
+++ b/chaos-at-home/mz-router.yml
@@ -2,6 +2,8 @@
 - name: Basic Setup
   hosts: mz-router
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
 
diff --git a/dan/ele-ap.yml b/dan/ele-ap.yml
index 42c00522..1bccdc57 100644
--- a/dan/ele-ap.yml
+++ b/dan/ele-ap.yml
@@ -2,6 +2,8 @@
 - name: Basic Setup
   hosts: ele-ap
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
   # post_tasks:
diff --git a/dan/ele-dolmetsch-ctl.yml b/dan/ele-dolmetsch-ctl.yml
index 717def3f..c9d47ea8 100644
--- a/dan/ele-dolmetsch-ctl.yml
+++ b/dan/ele-dolmetsch-ctl.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: ele-dolmetsch-ctl
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/dan/ele-orpheum.yml b/dan/ele-orpheum.yml
index 97b77edb..140d4fef 100644
--- a/dan/ele-orpheum.yml
+++ b/dan/ele-orpheum.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: ele-orpheum
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/dan/ele-router.yml b/dan/ele-router.yml
index 098b82b3..ebb8f8bd 100644
--- a/dan/ele-router.yml
+++ b/dan/ele-router.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: ele-router
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/dan/ele-tub.yml b/dan/ele-tub.yml
index c8bbe912..01668916 100644
--- a/dan/ele-tub.yml
+++ b/dan/ele-tub.yml
@@ -2,5 +2,7 @@
 - name: Basic Setup
   hosts: ele-tub
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
diff --git a/dan/ele-ups.yml b/dan/ele-ups.yml
index fa780eaf..de4efce7 100644
--- a/dan/ele-ups.yml
+++ b/dan/ele-ups.yml
@@ -2,6 +2,8 @@
 - name: Basic Setup
   hosts: ele-ups
   connection: local
+  gather_facts: no
+
   roles:
   - role: openwrt/image
   # post_tasks:
diff --git a/roles/openwrt/image/openwrt-keyring.gpg b/files/common/keyrings/openwrt.gpg
index 7dc3d397..7dc3d397 100644
--- a/roles/openwrt/image/openwrt-keyring.gpg
+++ b/files/common/keyrings/openwrt.gpg
diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/openwrt/image/tasks/fetch.yml
index 05d2ad6e..e68e2da5 100644
--- a/roles/openwrt/image/tasks/fetch.yml
+++ b/roles/openwrt/image/tasks/fetch.yml
@@ -22,11 +22,14 @@
 
     - name: Check OpenPGP signature
       command: >-
-        gpg --no-options --no-default-keyring --secret-keyring /dev/null
-             --verify --keyring "{{ role_path }}/openwrt-keyring.gpg"
-             --trust-model always
+        gpg --no-options --trust-model always --no-default-keyring --secret-keyring /dev/null
+             --verify --keyring "{{ global_files_dir }}/common/keyrings/openwrt.gpg"
              "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc"
       changed_when: False
+      register: openwrt_image_gpg_result
+
+    - debug:
+        var: openwrt_image_gpg_result.stderr_lines
 
     - name: Extract SHA256 hash of the imagebuilder archive
       command: grep '{{ openwrt_tarball_name }}' "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256"