]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
warn about gpg_url when repo_url is used 136/head
authorAlfredo Deza <alfredo.deza@inktank.com>
Tue, 19 Nov 2013 19:35:29 +0000 (14:35 -0500)
committerAlfredo Deza <alfredo.deza@inktank.com>
Tue, 19 Nov 2013 19:35:29 +0000 (14:35 -0500)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
ceph_deploy/install.py

index ac45182a680f5d5169fa421c0d17ecdd90aed8bc..ee4c5aa4e4c7de6a171be5f76147e13d07936ecf 100644 (file)
@@ -46,14 +46,14 @@ def install(args):
         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'
-        if gpg_url is None:
+        if gpg_url is None and repo_url:
             LOG.warning('--gpg-url was not used, will fallback')
             LOG.warning('using GPG fallback: %s', gpg_fallback)
             gpg_url = gpg_fallback
 
         if repo_url:  # triggers using a custom repository
             rlogger.info('using custom repository location: %s', repo_url)
-            distro.firewall_install(
+            distro.mirror_install(
                 distro,
                 repo_url,
                 gpg_url,