From d8fc546aaf7a3f33af67f3d4efdf6cf3099fb422 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 26 Oct 2015 12:56:29 -0600 Subject: [PATCH] download GPG keys from download.ceph.com This should be more reliable than the Gitweb interface. --- ceph_deploy/conf/cephdeploy.py | 8 ++++---- ceph_deploy/hosts/debian/install.py | 2 +- ceph_deploy/tests/unit/util/test_paths.py | 6 +++--- ceph_deploy/util/constants.py | 2 +- docs/source/conf.rst | 6 +++--- docs/source/install.rst | 4 ++-- docs/source/repo.rst | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ceph_deploy/conf/cephdeploy.py b/ceph_deploy/conf/cephdeploy.py index 8a85fa6..36ce18c 100644 --- a/ceph_deploy/conf/cephdeploy.py +++ b/ceph_deploy/conf/cephdeploy.py @@ -29,7 +29,7 @@ cd_conf_template = """ # yum repos: # [myrepo] # baseurl = http://gitbuilder.ceph.com/ceph-rpm-centos7-x86_64-basic/ref/hammer -# gpgurl = https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc +# gpgurl = https://download.ceph.com/keys/autobuild.asc # default = True # extra-repos = cephrepo # will install the cephrepo file too # @@ -39,18 +39,18 @@ cd_conf_template = """ # enabled=1 # gpgcheck=1 # type=rpm-md -# gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc +# gpgkey=https://download.ceph.com/keys/release.asc # apt repos: # [myrepo] # baseurl = http://gitbuilder.ceph.com/ceph-deb-trusty-x86_64-basic/ref/hammer -# gpgurl = https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc +# gpgurl = https://download.ceph.com/keys/autobuild.asc # default = True # extra-repos = cephrepo # will install the cephrepo file too # # [cephrepo] # baseurl=http://download.ceph.com/debian-hammer -# gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc +# gpgkey=https://download.ceph.com/keys/release.asc """.format(gpgurl=gpg.url('release')) diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py index fd3de59..68ca415 100644 --- a/ceph_deploy/hosts/debian/install.py +++ b/ceph_deploy/hosts/debian/install.py @@ -23,7 +23,7 @@ def install(distro, version_kind, version, adjust_repos, **kw): distro.packager.install(['ca-certificates', 'apt-transport-https']) if adjust_repos: - # Wheezy does not like the git.ceph.com SSL cert + # Wheezy does not like the download.ceph.com SSL cert protocol = 'https' if codename == 'wheezy': protocol = 'http' diff --git a/ceph_deploy/tests/unit/util/test_paths.py b/ceph_deploy/tests/unit/util/test_paths.py index 1f95dad..15f0956 100644 --- a/ceph_deploy/tests/unit/util/test_paths.py +++ b/ceph_deploy/tests/unit/util/test_paths.py @@ -39,12 +39,12 @@ class TestMonPaths(object): def test_gpg_url_release(self): result = paths.gpg.url('release') - assert result == "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc" + assert result == "https://download.ceph.com/keys/release.asc" def test_gpg_url_autobuild(self): result = paths.gpg.url('autobuild') - assert result == "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" + assert result == "https://download.ceph.com/keys/autobuild.asc" def test_gpg_url_http(self): result = paths.gpg.url('release', protocol="http") - assert result == "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc" + assert result == "http://download.ceph.com/release.asc" diff --git a/ceph_deploy/util/constants.py b/ceph_deploy/util/constants.py index 2acdd1e..74833b7 100644 --- a/ceph_deploy/util/constants.py +++ b/ceph_deploy/util/constants.py @@ -29,4 +29,4 @@ default_components = namedtuple('DefaultComponents', ['rpm', 'deb']) default_components.rpm = tuple(_base_components + ['ceph-radosgw']) default_components.deb = tuple(_base_components + ['radosgw']) -gpg_key_base_url = "git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/" +gpg_key_base_url = "download.ceph.com/keys/" diff --git a/docs/source/conf.rst b/docs/source/conf.rst index 91448fa..6eee392 100644 --- a/docs/source/conf.rst +++ b/docs/source/conf.rst @@ -52,7 +52,7 @@ This is how a default configuration file would look like:: # enabled=1 # gpgcheck=1 # type=rpm-md - # gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc + # gpgkey=https://download.ceph.com/keys/release.asc # apt repos: # [myrepo] @@ -63,7 +63,7 @@ This is how a default configuration file would look like:: # # [cephrepo] # baseurl=http://ceph.com/rpm-emperor/el6/noarch - # gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc + # gpgkey=https://download.ceph.com/keys/release.asc .. conf_sections: @@ -165,7 +165,7 @@ configuration file demonstrates):: enabled=1 gpgcheck=1 type=rpm-md - gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc + gpgkey=https://download.ceph.com/keys/release.asc In this case, the repository called ``myrepo`` defines the ``extra-repos`` key with just one extra one: ``cephrepo``. diff --git a/docs/source/install.rst b/docs/source/install.rst index 4050e9b..e165324 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -133,7 +133,7 @@ trying to compose the right URL for the release being installed. It is strongly suggested that both flags be provided. However, the ``--gpg-url`` will default to the current one in the ceph repository:: - https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc + https://download.ceph.com/keys/release.asc .. versionadded:: 1.3.3 @@ -150,7 +150,7 @@ top of the directory that holds the repository files. That file is used by Ceph as the key for its signed packages and it is usually retrieved from:: - https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc + https://download.ceph.com/keys/release.asc This is how it would look the process to get Ceph installed from a local repository in an admin host:: diff --git a/docs/source/repo.rst b/docs/source/repo.rst index 57f2730..e862048 100644 --- a/docs/source/repo.rst +++ b/docs/source/repo.rst @@ -21,7 +21,7 @@ The general format for adding a repo is:: As an example of adding the Ceph rpm-hammer repo for EL7:: - ceph-deploy repo --repo-url http://ceph.com/rpm-hammer/el7/x86_64/ --gpg-url 'https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc' ceph HOST1 + ceph-deploy repo --repo-url http://ceph.com/rpm-hammer/el7/x86_64/ --gpg-url 'https://download.ceph.com/keys/release.asc' ceph HOST1 In this example, the repo-name is ``ceph``, and the file ``/etc/yum.repos.d/ceph.repo`` will be created. Because ``--gpg-url`` was passed, the repo will have ``gpgcheck=1`` @@ -29,7 +29,7 @@ and will reference the given GPG key. For APT, the equivalent example would be:: - ceph-deploy repo --repo-url http://ceph.com/debian-hammer --gpg-url 'https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc' ceph HOST1 + ceph-deploy repo --repo-url http://ceph.com/debian-hammer --gpg-url 'https://download.ceph.com/keys/release.asc' ceph HOST1 If a repo was defined in cephdeploy.conf, like the following:: -- 2.47.3