From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 27 Mar 2015 00:54:36 +0000 (-0700)
Subject: calamari_setup: der.  Use dict.update() correctly
X-Git-Tag: v10.2.6~165^2^2~518^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58174f05e93e1d3d5ed45971c8e97533f4e3182c;p=ceph.git

calamari_setup: der.  Use dict.update() correctly

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 908f4bda462..a7106c2a6ea 100644
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -51,7 +51,9 @@ def task(ctx, config):
     calamari_user -- user name to log into gui
     calamari_password -- calamari user password
     """
-    config = DEFAULTS.update(config)
+    local_config = DEFAULTS
+    local_config.update(config)
+    config = local_config
     cal_svr = None
     for remote_, roles in ctx.cluster.remotes.items():
         if 'client.0' in roles: