From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Tue, 19 Nov 2013 19:35:29 +0000 (-0500)
Subject: warn about gpg_url when repo_url is used
X-Git-Tag: v1.3.3~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4886526e34e98c6b82acd529d00aa8d64cadf070;p=ceph-deploy.git

warn about gpg_url when repo_url is used

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index ac45182..ee4c5aa 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -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,