From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Wed, 14 May 2014 13:02:30 +0000 (-0700)
Subject: disable proxies for apt when needed
X-Git-Tag: v1.5.3~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c20989f68e8024faeeca8887ed596ab10f4e6fca;p=ceph-deploy.git

disable proxies for apt when needed

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

diff --git a/ceph_deploy/calamari.py b/ceph_deploy/calamari.py
index 34a1cfe..a7e0617 100644
--- a/ceph_deploy/calamari.py
+++ b/ceph_deploy/calamari.py
@@ -52,6 +52,12 @@ def connect(args):
             distro.codename
         )
         rlogger = logging.getLogger(hostname)
+        if distro.name in ('debian', 'ubuntu'):
+            rlogger.info('ensuring proxy is disabled for calamari minions repo')
+            distro.conn.remote_module.write_file(
+                '/etc/apt/apt.conf.d/99ceph',
+                'Acquire::http::Proxy::%s DIRECT;' % args.master,
+            )
         rlogger.info('installing calamari-minion package on %s' % hostname)
         rlogger.info('adding custom repository file')
         try: