[RM-11406] Add function to get ceph.com GPG Key URL

Signed-off-by: Travis Rhoden <trhoden@redhat.com>

diff --git a/ceph_deploy/tests/unit/util/test_paths.py b/ceph_deploy/tests/unit/util/test_paths.py
index 845da2224bb1659b7b62725a6ae13e20cb06c7db..3ec972679c302b6aee194a91658f8f028737fbc9 100644 (file)
--- a/ceph_deploy/tests/unit/util/test_paths.py
+++ b/ceph_deploy/tests/unit/util/test_paths.py
@@ -36,3 +36,11 @@ class TestMonPaths(object):
         result = paths.mon.monmap('mycluster', 'myhostname')
         assert result.startswith('/')
         assert result.endswith('tmp/mycluster.myhostname.monmap')
+
+    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"
+
+    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"

diff --git a/ceph_deploy/util/constants.py b/ceph_deploy/util/constants.py
index 9920dd593db51b870b02053281a5d9e3a303a72a..f440939d571f883c25f99935a0c42a91c3919fb4 100644 (file)
--- a/ceph_deploy/util/constants.py
+++ b/ceph_deploy/util/constants.py
@@ -28,3 +28,5 @@ default_components = namedtuple('DefaultComponents', ['rpm', 'deb'])
 # TODO: This needs to get unified once the packaging naming gets consistent
 default_components.rpm = tuple(_base_components + ['ceph-radosgw'])
 default_components.deb = tuple(_base_components + ['radosgw'])
+
+gpg_key_base_url = "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/"

diff --git a/ceph_deploy/util/paths/__init__.py b/ceph_deploy/util/paths/__init__.py
index df19461704aa09295be1861e6011fef33f65aaa7..45095cb66c98c3fc2ef2afbbe5c58c6b9acea062 100644 (file)
--- a/ceph_deploy/util/paths/__init__.py
+++ b/ceph_deploy/util/paths/__init__.py
@@ -1,2 +1,3 @@
 import mon # noqa
 import osd # noqa
+import gpg # noqa

diff --git a/ceph_deploy/util/paths/gpg.py b/ceph_deploy/util/paths/gpg.py
new file mode 100644 (file)
index 0000000..2115367
--- /dev/null
+++ b/ceph_deploy/util/paths/gpg.py
@@ -0,0 +1,4 @@
+from ceph_deploy.util import constants
+
+def url(key_type):
+    return "%s%s.asc" % (constants.gpg_key_base_url, key_type)