From 6c4541bb280f3036a06a46c23638a98f9086ba77 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Dec 2019 15:41:14 -0600 Subject: [PATCH] qa/tasks/ceph2 -> cephadm Signed-off-by: Sage Weil --- .github/CODEOWNERS | 2 +- qa/suites/rados/cephadm/mode/packaged.yaml | 2 +- qa/suites/rados/cephadm/mode/root.yaml | 2 +- qa/suites/rados/cephadm/start.yaml | 2 +- qa/tasks/{ceph2.conf => cephadm.conf} | 0 qa/tasks/{ceph2.py => cephadm.py} | 5 ++--- 6 files changed, 6 insertions(+), 7 deletions(-) rename qa/tasks/{ceph2.conf => cephadm.conf} (100%) rename qa/tasks/{ceph2.py => cephadm.py} (99%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 493b1fc4c97..8f8553d07a2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -17,7 +17,7 @@ /src/pybind/mgr/test_orchestrator @ceph/orchestrators /src/python-common/ceph/deployment @ceph/orchestrators /qa/workunits/cephadm/test_cephadm.sh @ceph/orchestrators -/qa/tasks/ceph2.py @ceph/orchestrators +/qa/tasks/cephadm.py @ceph/orchestrators /qa/tasks/mgr/test_orchestrator_cli.py @ceph/orchestrators /qa/tasks/mgr/test_cephadm_orchestrator.py @ceph/orchestrators /doc/mgr/orchestrator_cli.rst @ceph/orchestrators diff --git a/qa/suites/rados/cephadm/mode/packaged.yaml b/qa/suites/rados/cephadm/mode/packaged.yaml index 33e7d7b05c6..ba8d432189e 100644 --- a/qa/suites/rados/cephadm/mode/packaged.yaml +++ b/qa/suites/rados/cephadm/mode/packaged.yaml @@ -1,5 +1,5 @@ overrides: - ceph2: + cephadm: cephadm_mode: cephadm-package install: extra_packages: [cephadm] diff --git a/qa/suites/rados/cephadm/mode/root.yaml b/qa/suites/rados/cephadm/mode/root.yaml index d9ef264d3b7..bedb31d5d67 100644 --- a/qa/suites/rados/cephadm/mode/root.yaml +++ b/qa/suites/rados/cephadm/mode/root.yaml @@ -1,3 +1,3 @@ overrides: - ceph2: + cephadm: cephadm_mode: root diff --git a/qa/suites/rados/cephadm/start.yaml b/qa/suites/rados/cephadm/start.yaml index d43d570915f..8ac4c25779d 100644 --- a/qa/suites/rados/cephadm/start.yaml +++ b/qa/suites/rados/cephadm/start.yaml @@ -1,3 +1,3 @@ tasks: - install: -- ceph2: +- cephadm: diff --git a/qa/tasks/ceph2.conf b/qa/tasks/cephadm.conf similarity index 100% rename from qa/tasks/ceph2.conf rename to qa/tasks/cephadm.conf diff --git a/qa/tasks/ceph2.py b/qa/tasks/cephadm.py similarity index 99% rename from qa/tasks/ceph2.py rename to qa/tasks/cephadm.py index 3ae49ab7739..fb2d24d22f4 100644 --- a/qa/tasks/ceph2.py +++ b/qa/tasks/cephadm.py @@ -1,5 +1,5 @@ """ -Ceph cluster task, deployed via cephadm and ssh orchestrator +Ceph cluster task, deployed via cephadm orchestrator """ from cStringIO import StringIO @@ -56,7 +56,7 @@ def _shell(ctx, cluster_name, remote, args, **kwargs): def build_initial_config(ctx, config): cluster_name = config['cluster'] - path = os.path.join(os.path.dirname(__file__), 'ceph2.conf') + path = os.path.join(os.path.dirname(__file__), 'cephadm.conf') conf = configobj.ConfigObj(path, file_error=True) conf.setdefault('global', {}) @@ -860,4 +860,3 @@ def task(ctx, config): finally: log.info('Teardown begin') - -- 2.39.5