From 0a754228dcc385edf45ff4bcb3a03e69d13d856d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 3 Jun 2020 17:39:00 +0800 Subject: [PATCH] conf/cephdeploy.py: use gpg.url() for cephdeploy.conf template see also e12d1c17c30ee17850dfc2ab2b9716d9f5f8ca6d, it's a regression introduced by b611bdf863871f134d2f982ae5e0e70a498c0a99 Signed-off-by: Kefu Chai --- ceph_deploy/conf/cephdeploy.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ceph_deploy/conf/cephdeploy.py b/ceph_deploy/conf/cephdeploy.py index 3e109da..22e768b 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://download.ceph.com/keys/autobuild.asc +# gpgurl = {gpg_url_autobuild} # default = True # extra-repos = cephrepo # will install the cephrepo file too # @@ -39,19 +39,20 @@ cd_conf_template = """ # enabled=1 # gpgcheck=1 # type=rpm-md -# gpgkey=https://download.ceph.com/keys/release.asc +# gpgkey={gpg_url_release} # apt repos: # [myrepo] # baseurl = http://gitbuilder.ceph.com/ceph-deb-trusty-x86_64-basic/ref/hammer -# gpgurl = https://download.ceph.com/keys/autobuild.asc +# gpgurl = {gpg_url_autobuild} # default = True # extra-repos = cephrepo # will install the cephrepo file too # # [cephrepo] # baseurl=http://download.ceph.com/debian-hammer -# gpgkey=https://download.ceph.com/keys/release.asc -""".format(gpgurl=gpg.url('release')) +# gpgkey={gpg_url_release} +""".format(gpg_url_release=gpg.url('release'), + gpg_url_autobuild=gpg.url('autobuild')) def location(): -- 2.47.3