From 8f54f89404599d75234f8b3f4a772d080bbbf202 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 13 Apr 2021 12:09:26 -0400 Subject: [PATCH] qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults Signed-off-by: Sage Weil (cherry picked from commit c20323d114e6c8072ecdf26f77a58ae734d38d0e) --- qa/suites/rados/cephadm/smoke-singlehost/% | 0 .../rados/cephadm/smoke-singlehost/0-distro$ | 1 + .../cephadm/smoke-singlehost/1-start.yaml | 27 +++++++++++++++++++ .../smoke-singlehost/2-services/basic.yaml | 0 .../smoke-singlehost/2-services/rgw.yaml | 12 +++++++++ .../cephadm/smoke-singlehost/3-final.yaml | 8 ++++++ qa/tasks/cephadm.py | 2 ++ 7 files changed, 50 insertions(+) create mode 100644 qa/suites/rados/cephadm/smoke-singlehost/% create mode 120000 qa/suites/rados/cephadm/smoke-singlehost/0-distro$ create mode 100644 qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml create mode 100644 qa/suites/rados/cephadm/smoke-singlehost/2-services/basic.yaml create mode 100644 qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml create mode 100644 qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml diff --git a/qa/suites/rados/cephadm/smoke-singlehost/% b/qa/suites/rados/cephadm/smoke-singlehost/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ b/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ new file mode 120000 index 0000000000000..d2dffb181881d --- /dev/null +++ b/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ @@ -0,0 +1 @@ +../smoke/distro \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml b/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml new file mode 100644 index 0000000000000..ca6019c66cfe5 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml @@ -0,0 +1,27 @@ +tasks: +- cephadm: + roleless: true + single_host_defaults: true +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls +roles: +- - host.a + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +openstack: +- volumes: # attached to each instance + count: 4 + size: 10 # GB +overrides: + ceph: + conf: + osd: + osd shutdown pgref assert: true diff --git a/qa/suites/rados/cephadm/smoke-singlehost/2-services/basic.yaml b/qa/suites/rados/cephadm/smoke-singlehost/2-services/basic.yaml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml new file mode 100644 index 0000000000000..161b15c770cf0 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml @@ -0,0 +1,12 @@ +tasks: +- cephadm.apply: + specs: + - service_type: rgw + service_id: foo + placement: + count_per_host: 4 + host_pattern: "*" + spec: + rgw_frontend_port: 8000 +- sleep: + interval: 60 diff --git a/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml b/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml new file mode 100644 index 0000000000000..02f5b289c1ad0 --- /dev/null +++ b/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml @@ -0,0 +1,8 @@ +tasks: +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index c1b6970c86741..f7113a6cad838 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -393,6 +393,8 @@ def ceph_bootstrap(ctx, config): cmd += ['--skip-dashboard'] if config.get('skip_monitoring_stack'): cmd += ['--skip-monitoring-stack'] + if config.get('single_host_defaults'): + cmd += ['--single-host-defaults'] # bootstrap makes the keyring root 0600, so +r it for our purposes cmd += [ run.Raw('&&'), -- 2.39.5