]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
disable proxies for apt when needed 188/head
authorAlfredo Deza <alfredo.deza@inktank.com>
Wed, 14 May 2014 13:02:30 +0000 (06:02 -0700)
committerAlfredo Deza <alfredo.deza@inktank.com>
Wed, 14 May 2014 13:02:30 +0000 (06:02 -0700)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
ceph_deploy/calamari.py

index 34a1cfe7243a0f669031aaa9e0333cfcdd663622..a7e0617740ab203a687e7f8bfbe3aef7c0cd3499 100644 (file)
@@ -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: