From 28b3c242bdbfc655534cdd037966ed1dcddc978a Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Wed, 26 Jul 2017 14:58:50 -0700 Subject: [PATCH] Add option to skip mgr install for old release Signed-off-by: Vasu Kulkarni (cherry picked from commit a9be0c387ed2ae09227dad833c8647af110bd2de) --- qa/tasks/ceph_deploy.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py index b22c32113ced9..bccf64b349d08 100644 --- a/qa/tasks/ceph_deploy.py +++ b/qa/tasks/ceph_deploy.py @@ -241,10 +241,15 @@ def build_ceph_cluster(ctx, config): mds_nodes = " ".join(mds_nodes) mon_node = get_nodes_using_role(ctx, 'mon') mon_nodes = " ".join(mon_node) - mgr_nodes = get_nodes_using_role(ctx, 'mgr') - mgr_nodes = " ".join(mgr_nodes) + # skip mgr based on config item + # this is needed when test uses latest code to install old ceph versions + skip_mgr = config.get('skip-mgr', False) + if not skip_mgr: + mgr_nodes = get_nodes_using_role(ctx, 'mgr') + mgr_nodes = " ".join(mgr_nodes) new_mon = './ceph-deploy new' + " " + mon_nodes - mgr_create = './ceph-deploy mgr create' + " " + mgr_nodes + if not skip_mgr: + mgr_create = './ceph-deploy mgr create' + " " + mgr_nodes mon_hostname = mon_nodes.split(' ')[0] mon_hostname = str(mon_hostname) gather_keys = './ceph-deploy gatherkeys' + " " + mon_hostname @@ -307,7 +312,8 @@ def build_ceph_cluster(ctx, config): estatus_gather = execute_ceph_deploy(gather_keys) - execute_ceph_deploy(mgr_create) + if not skip_mgr: + execute_ceph_deploy(mgr_create) if mds_nodes: estatus_mds = execute_ceph_deploy(deploy_mds) @@ -700,6 +706,8 @@ def task(ctx, config): bluestore: True # or filestore: True + # skip install of mgr for old release using below flag + skip-mgr: True ( default is False ) tasks: - install: -- 2.39.5