From e12d1c17c30ee17850dfc2ab2b9716d9f5f8ca6d Mon Sep 17 00:00:00 2001 From: Travis Rhoden Date: Thu, 28 May 2015 10:50:14 -0400 Subject: [PATCH] [RM-11406] use gpg.url() for cephdeploy.conf template Signed-off-by: Travis Rhoden --- ceph_deploy/conf/cephdeploy.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ceph_deploy/conf/cephdeploy.py b/ceph_deploy/conf/cephdeploy.py index 6d62d5b..30c991e 100644 --- a/ceph_deploy/conf/cephdeploy.py +++ b/ceph_deploy/conf/cephdeploy.py @@ -4,6 +4,8 @@ import os from os import path import re +from ceph_deploy.util.paths import gpg + logger = logging.getLogger('ceph_deploy.conf') cd_conf_template = """ @@ -37,7 +39,7 @@ 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={gpgurl} # apt repos: # [myrepo] @@ -48,8 +50,8 @@ cd_conf_template = """ # # [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={gpgurl} +""".format(gpgurl=gpg.url('release')) def location(): -- 2.47.3