From 5defb8f179a99d9e16976e4200c82ab1381e5c87 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 1 Jul 2014 13:52:17 -0400 Subject: [PATCH] define options per host in calamari connect Signed-off-by: Alfredo Deza --- ceph_deploy/calamari.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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') -- 2.47.3