From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 16 Feb 2016 00:11:38 +0000 (-0800)
Subject: Include /keys in path to key files, and document what's expected
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9234bcb9c1de6a29c2f4e65a7db9fb4e26d778a3;p=ceph-cm-ansible.git

Include /keys in path to key files, and document what's expected

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index 87e70e5..040103c 100644
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -43,7 +43,7 @@ The host to use as a github mirror::
 
     git_mirror_host: git.ceph.com
 
-The host to find package-signing keys on:
+The host to find package-signing keys on (at https://{{key_host}}/keys/{release,autobuild}.asc)::
 
     key_host: download.ceph.com
 
diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml
index ad45dce..131923c 100644
--- a/roles/testnode/tasks/apt/repos.yml
+++ b/roles/testnode/tasks/apt/repos.yml
@@ -35,8 +35,8 @@
     url: "{{ item }}"
     state: present
   with_items:
-    - "http://{{ key_host }}/autobuild.asc"
-    - "http://{{ key_host }}/release.asc"
+    - "http://{{ key_host }}/keys/autobuild.asc"
+    - "http://{{ key_host }}/keys/release.asc"
   # try for 2 minutes before failing
   retries: 24
   delay: 5
diff --git a/roles/testnode/tasks/yum/gpg_keys.yml b/roles/testnode/tasks/yum/gpg_keys.yml
index b2540d8..5c216c9 100644
--- a/roles/testnode/tasks/yum/gpg_keys.yml
+++ b/roles/testnode/tasks/yum/gpg_keys.yml
@@ -13,6 +13,6 @@
     key: "{{ item }}"
     validate_certs: no
   with_items:
-    - 'https://{{ key_host }}/release.asc'
-    - 'https://{{ key_host }}/autobuild.asc'
+    - 'https://{{ key_host }}/keys/release.asc'
+    - 'https://{{ key_host }}/keys/autobuild.asc'
   register: gpg_keys