From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 18 Nov 2013 18:33:00 +0000 (-0500)
Subject: remove gpg_fallback from centos firewall_install
X-Git-Tag: v1.3.3~14^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fefe166d798d75081a656313881a45cdc2979eae;p=ceph-deploy.git

remove gpg_fallback from centos firewall_install

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

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index bc68e1a..15b749e 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -97,12 +97,6 @@ def install_epel(distro):
 
 def firewall_install(distro, repo_url, gpg_url, adjust_repos):
     repo_url = repo_url.strip('/')  # Remove trailing slashes
-    gpg_fallback = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
-    logger = distro.conn.logger
-    if gpg_url is None:
-        logger.warning('--gpg-url was not used, will fallback')
-        logger.warning('using GPG fallback: %s', gpg_fallback)
-        gpg_url = gpg_fallback
 
     if adjust_repos:
         process.run(