Stop looking for keys on git.ceph.com

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

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index 9dd924b3cd87417e3bf35aab9997f186ca52f6a3..87e70e5673a8b12f2173c46ad55a373916805503 100644 (file)
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -43,6 +43,10 @@ The host to use as a github mirror::
 
     git_mirror_host: git.ceph.com
 
+The host to find package-signing keys on:
+
+    key_host: download.ceph.com
+
 This host is used by teuthology to download ceph packages and will be given higher priority on apt systems::
 
     gitbuilder_host: gitbuilder.ceph.com

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index 311e628ce8e518391cf7f61f1e70d0e3a83c548d..24fc048a2e8fbadcfb63304ac6dc735f2062bb02 100644 (file)
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 mirror_host: apt-mirror.sepia.ceph.com
 git_mirror_host: git.ceph.com
+key_host: download.ceph.com
 gitbuilder_host: gitbuilder.ceph.com
 pip_mirror_url: "http://{{ mirror_host }}/pypi/simple"
 

diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml
index 4dc6faa1dbc5f8e671fdb346784c887a5ea28d50..ad45dce83559513194911cf9f5f1f3c03cda536d 100644 (file)
--- 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://{{ git_mirror_host }}/autobuild.asc"
-    - "http://{{ git_mirror_host }}/release.asc"
+    - "http://{{ key_host }}/autobuild.asc"
+    - "http://{{ key_host }}/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 104344fbffc0d974f98f2b8abdfe1e4b0f5d9370..b2540d868de878f11fb7f8ed8b3755c0e8cc5fa4 100644 (file)
--- 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://{{ git_mirror_host }}/release.asc'
-    - 'https://{{ git_mirror_host }}/autobuild.asc'
+    - 'https://{{ key_host }}/release.asc'
+    - 'https://{{ key_host }}/autobuild.asc'
   register: gpg_keys