From 42b41080734ef1ec8e8dbba21a756f8e4a11c795 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Sep 2021 10:48:41 -0500 Subject: [PATCH] qa/tasks/rook: fix shadowing of config arg in rook_cluster() Signed-off-by: Sage Weil --- qa/tasks/rook.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/tasks/rook.py b/qa/tasks/rook.py index 6d1920d23fda4..b005191ccc920 100644 --- a/qa/tasks/rook.py +++ b/qa/tasks/rook.py @@ -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() } })) -- 2.39.5