From 548802dd223ddf3a25c3d6f402855a87bc6669f5 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 15 Feb 2016 14:30:39 -0800 Subject: [PATCH] Stop looking for keys on git.ceph.com Signed-off-by: Dan Mick --- roles/testnode/README.rst | 4 ++++ roles/testnode/defaults/main.yml | 1 + roles/testnode/tasks/apt/repos.yml | 4 ++-- roles/testnode/tasks/yum/gpg_keys.yml | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index 9dd924b..87e70e5 100644 --- 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 311e628..24fc048 100644 --- 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 4dc6faa..ad45dce 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://{{ 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 104344f..b2540d8 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://{{ git_mirror_host }}/release.asc' - - 'https://{{ git_mirror_host }}/autobuild.asc' + - 'https://{{ key_host }}/release.asc' + - 'https://{{ key_host }}/autobuild.asc' register: gpg_keys -- 2.39.5