]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/rook: fix shadowing of config arg in rook_cluster()
authorSage Weil <sage@newdream.net>
Fri, 3 Sep 2021 15:48:41 +0000 (10:48 -0500)
committerSage Weil <sage@newdream.net>
Fri, 3 Sep 2021 15:49:54 +0000 (10:49 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
qa/tasks/rook.py

index 6d1920d23fda4735bc64ecd7c226439dae3db1f7..b005191ccc92099afe72e04f9f5b3ffacc53985f 100644 (file)
@@ -318,18 +318,18 @@ def rook_cluster(ctx, config):
     ctx.rook[cluster_name].num_osds = num_devs
 
     # config
-    config = build_initial_config(ctx, config)
-    config_fp = BytesIO()
-    config.write(config_fp)
-    log.info(f'Config:\n{config_fp.getvalue()}')
-    _kubectl(ctx, config, ['create', '-f', '-'], stdin=yaml.dump({
+    ceph_conf = build_initial_config(ctx, config)
+    ceph_conf_fp = BytesIO()
+    ceph_conf.write(ceph_conf_fp)
+    log.info(f'Config:\n{ceph_conf_fp.getvalue()}')
+    _kubectl(ctx, ceph_conf, ['create', '-f', '-'], stdin=yaml.dump({
         'apiVersion': 'v1',
         'kind': 'ConfigMap',
         'metadata': {
             'name': 'rook-config-override',
             'namespace': 'rook-ceph'},
         'data': {
-            'config': config_fp.getvalue()
+            'config': ceph_conf_fp.getvalue()
         }
     }))