[RM-11406] Support http or https for gpg 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 3ec972679c302b6aee194a91658f8f028737fbc9..1f95dad486ef242a7a1b2eaf5d093f4864ad4cd4 100644 (file)
--- a/ceph_deploy/tests/unit/util/test_paths.py
+++ b/ceph_deploy/tests/unit/util/test_paths.py
@@ -44,3 +44,7 @@ class TestMonPaths(object):
     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"
+
+    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"

diff --git a/ceph_deploy/util/constants.py b/ceph_deploy/util/constants.py
index f440939d571f883c25f99935a0c42a91c3919fb4..2acdd1e649a92d67e56c2e9fcb909b81e1f47126 100644 (file)
--- 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 = "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/"
+gpg_key_base_url = "git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/"

diff --git a/ceph_deploy/util/paths/gpg.py b/ceph_deploy/util/paths/gpg.py
index 2115367a142d13116010e7d6adb9316827fea6d4..d9d950b8d3f716fe436d32f872690bf3142ac3ef 100644 (file)
--- a/ceph_deploy/util/paths/gpg.py
+++ b/ceph_deploy/util/paths/gpg.py
@@ -1,4 +1,8 @@
 from ceph_deploy.util import constants
 
-def url(key_type):
-    return "%s%s.asc" % (constants.gpg_key_base_url, key_type)
+def url(key_type, protocol="https"):
+    return "{protocol}://{url}{key_type}.asc".format(
+        protocol=protocol,
+        url=constants.gpg_key_base_url,
+        key_type=key_type
+    )