From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Tue, 1 Jul 2014 17:52:17 +0000 (-0400)
Subject: define options per host in calamari connect
X-Git-Tag: v1.5.7~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F205%2Fhead;p=ceph-deploy.git

define options per host in calamari connect

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

diff --git a/ceph_deploy/calamari.py b/ceph_deploy/calamari.py
index 0c835ba..2aa82c0 100644
--- a/ceph_deploy/calamari.py
+++ b/ceph_deploy/calamari.py
@@ -32,10 +32,6 @@ def connect(args):
     if not has_minion_repo:
         raise RuntimeError('no calamari-minion repo found')
 
-    # We rely on the default for repo installs that does not
-    # install ceph unless specified otherwise
-    options = dict(cd_conf.items(repo_name))
-
     for hostname in args.hosts:
         distro = hosts.get(hostname, username=args.username)
         if not distro_is_supported(distro.normalized_name):
@@ -51,6 +47,13 @@ def connect(args):
             distro.release,
             distro.codename
         )
+
+        # We rely on the default for repo installs that does not install ceph
+        # unless specified otherwise. We define the `options` dictionary here
+        # because ceph-deploy pops items iternally and that causes issues when
+        # those items need to be available for every host
+        options = dict(cd_conf.items(repo_name))
+
         rlogger = logging.getLogger(hostname)
         if distro.name in ('debian', 'ubuntu'):
             rlogger.info('ensuring proxy is disabled for calamari minions repo')