From e58bf3438693587e62a9f73b644f51c65f67249b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 28 Mar 2019 11:19:05 -0500 Subject: [PATCH] qa/suites/rados/thrash-old-clients: fix up v1/v2 options - don't specify ceph.py options in the ceph.py - instead, specify them in the per-version facet Note that we don't currently have a way to do v2 only for the mon IPs, so in the v2only cases, we are still binding the mons to v1. Signed-off-by: Sage Weil --- qa/suites/rados/thrash-old-clients/1-install/hammer.yaml | 4 ++++ .../rados/thrash-old-clients/1-install/jewel-v1only.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 7 +++++++ .../thrash-old-clients/1-install/luminous-v1only.yaml | 1 + .../rados/thrash-old-clients/1-install/luminous.yaml | 7 +++++++ .../rados/thrash-old-clients/1-install/mimic-v1only.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/mimic.yaml | 8 ++++++++ .../thrash-old-clients/1-install/nautilus-v1only.yaml | 1 + qa/suites/rados/thrash-old-clients/ceph.yaml | 5 ----- 9 files changed, 30 insertions(+), 5 deletions(-) diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml index 1f9cd277e70..933aebb3ea6 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -1,7 +1,11 @@ overrides: ceph: + mon_bind_addrvec: false + mon_bind_msgr2: false crush_tunables: hammer conf: + global: + ms bind msgr2: false mon: mon osd initial require min compat client: hammer tasks: diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml index 5468e520585..9dd47f4f992 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml @@ -1,5 +1,6 @@ overrides: ceph: + mon_bind_addrvec: false mon_bind_msgr2: false conf: global: diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml index eae5ffc2677..824fbe44a2e 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -1,3 +1,10 @@ +overrides: + ceph: + mon_bind_addrvec: false + mon_bind_msgr2: false + conf: + global: + mon warn on msgr2 not enabled: false tasks: - install: branch: jewel diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml index 09698142972..864184827cb 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml @@ -1,6 +1,7 @@ overrides: ceph: mon_bind_msgr2: false + mon_bind_addrvec: false conf: global: ms type: async diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml index eb9a3a2ecc7..30edfcf9e9c 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -1,3 +1,10 @@ +overrides: + ceph: + mon_bind_addrvec: false + mon_bind_msgr2: false + conf: + global: + mon warn on msgr2 not enabled: false tasks: - install: branch: luminous diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml index 3ea7bf87d00..d63e07d194c 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml @@ -1,5 +1,6 @@ overrides: ceph: + mon_bind_addrvec: false mon_bind_msgr2: false conf: global: diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml index 8ac2a7bd22f..a7449e4d032 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml @@ -1,3 +1,11 @@ +overrides: + ceph: + mon_bind_addrvec: false + mon_bind_msgr2: false + conf: + global: + ms type: async + mon warn on msgr2 not enabled: false tasks: - install: branch: mimic diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml index 55fcd32ab0a..01975defac6 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml @@ -1,6 +1,7 @@ overrides: ceph: mon_bind_msgr2: false + mon_bind_addrvec: false conf: global: ms type: async diff --git a/qa/suites/rados/thrash-old-clients/ceph.yaml b/qa/suites/rados/thrash-old-clients/ceph.yaml index 364f9d03b06..5df450dc956 100644 --- a/qa/suites/rados/thrash-old-clients/ceph.yaml +++ b/qa/suites/rados/thrash-old-clients/ceph.yaml @@ -1,7 +1,2 @@ tasks: - ceph: - mon_bind_addrvec: false - mon_bind_msgr2: false - conf: - global: - ms bind msgr2: false -- 2.39.5