[RM-11406] Point to git.ceph.com for GPG keys

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

diff --git a/ceph_deploy/conf/cephdeploy.py b/ceph_deploy/conf/cephdeploy.py
index 3df09deb837a1380ddcd7c011b215114ea3ef4a6..6d62d5b56fd6c2a41f30da68cd583082cb0bad06 100644 (file)
--- a/ceph_deploy/conf/cephdeploy.py
+++ b/ceph_deploy/conf/cephdeploy.py
@@ -37,7 +37,7 @@ cd_conf_template = """
 # enabled=1
 # gpgcheck=1
 # type=rpm-md
-# gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+# gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc
 
 # apt repos:
 # [myrepo]
@@ -48,7 +48,7 @@ cd_conf_template = """
 #
 # [cephrepo]
 # baseurl=http://ceph.com/rpm-emperor/el6/noarch
-# gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+# gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc
 """
 
 

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index 2f768cf43032d95f19e9707ff25e8cf1cb3fc069..bb91b4a26559bf14e822dc3b69e9716a575961b7 100644 (file)
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -63,7 +63,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                 [
                     'rpm',
                     '--import',
-                    "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key)
+                    "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key)
                 ]
             )
 
@@ -94,7 +94,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                     release=release.split(".", 1)[0],
                     machine=machine,
                     version=version),
-                "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key),
+                "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key),
                 adjust_repos=True,
                 extra_installs=False
             )

diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index bdb3f1b4f60a34cc80b901305c1b1eecaa0004fa..db4c431dd6212c50e3cbe3b3a7bcbc1c78328536 100644 (file)
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -36,7 +36,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                 'wget',
                 '-O',
                 '{key}.asc'.format(key=key),
-                'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc'.format(key=key),
+                'https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc'.format(key=key),
             ],
             stop_on_nonzero=False,
         )

diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py
index 1c4ed2d45ecc7bfc47f8a5db5dc6386e633edf39..59a42fa885320221613e613ad4a897f6be28a537 100644 (file)
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@ -26,7 +26,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                 [
                     'rpm',
                     '--import',
-                    "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key)
+                    "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key)
                 ]
             )
 
@@ -64,7 +64,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
                     release=release.split(".", 1)[0],
                     machine=machine,
                     version=version),
-                "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key),
+                "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(key=key),
                 adjust_repos=True,
                 extra_installs=False
             )

diff --git a/ceph_deploy/hosts/suse/install.py b/ceph_deploy/hosts/suse/install.py
index 6047640522fc2c040fc615a1694df05555bbfec3..93bf45f4c59c0aba9bdebe49d0fcca465fc0e94c 100644 (file)
--- a/ceph_deploy/hosts/suse/install.py
+++ b/ceph_deploy/hosts/suse/install.py
@@ -40,7 +40,7 @@ def install(distro, version_kind, version, adjust_repos, **kw):
             [
                 'rpm',
                 '--import',
-                "{protocol}://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(
+                "{protocol}://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/{key}.asc".format(
                     key=key,
                     protocol=protocol)
             ]

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 6baf7477da0b90355dd2f77687e1644d01edcd8b..b64f3e724a4780a2701516b7c609408c8f3a6a5a 100644 (file)
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -137,7 +137,7 @@ def install(args):
         # custom repo arguments
         repo_url = os.environ.get('CEPH_DEPLOY_REPO_URL') or args.repo_url
         gpg_url = os.environ.get('CEPH_DEPLOY_GPG_URL') or args.gpg_url
-        gpg_fallback = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+        gpg_fallback = 'https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc'
 
         if gpg_url is None and repo_url:
             LOG.warning('--gpg-url was not used, will fallback')

diff --git a/docs/source/conf.rst b/docs/source/conf.rst
index 28b88c86d44fffdbba8ae901564a9737a7e36a40..91448fafea5851213d1d78e711b3b439cb003d8f 100644 (file)
--- 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://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+    # gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=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://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+    # gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc
 
 .. conf_sections:
 
@@ -165,7 +165,7 @@ configuration file demonstrates)::
     enabled=1
     gpgcheck=1
     type=rpm-md
-    gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+    gpgkey=https://git.ceph.com/?p=ceph.git;a=blob_plain;f=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 8b3710d2bb7cb2c17c7864fe89e9653c4772727d..4050e9b7060eeeea815cb6988d940aacd364b8f5 100644 (file)
--- 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://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+    https://git.ceph.com/?p=ceph.git;a=blob_plain;f=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://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+        https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc
 
 This is how it would look the process to get Ceph installed from a local
 repository in an admin host::