From c14234efd9e8359b4fe58dd677739d5d02451ba1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 21 Dec 2019 19:45:00 -0600 Subject: [PATCH] qa/suites/rados/thrash-old-clients: configure mons in terms of addrvecs This is more explicit. More importantly, the 'mon update' command can't handle an "ip:port"; it wants either a CIDR, bare IP, or addrvec. Signed-off-by: Sage Weil --- qa/suites/rados/thrash-old-clients/1-install/hammer.yaml | 1 - qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml | 1 - qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 1 - .../rados/thrash-old-clients/1-install/luminous-v1only.yaml | 1 - qa/suites/rados/thrash-old-clients/1-install/luminous.yaml | 1 - qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml | 1 - qa/suites/rados/thrash-old-clients/1-install/mimic.yaml | 1 - .../rados/thrash-old-clients/1-install/nautilus-v1only.yaml | 1 - 8 files changed, 8 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 46b76afe6a3f1..419425dde4d79 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -1,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false crush_tunables: hammer log-whitelist: 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 641304a0aa087..cbf26243d6821 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,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false log-whitelist: - \(MON_DOWN\) 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 4f2349411c0fc..c3f0f3fa09d7c 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -1,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false log-whitelist: - \(MON_DOWN\) 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 aab403469209b..45aaa92549b76 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,7 +1,6 @@ overrides: ceph: mon_bind_msgr2: false - mon_bind_addrvec: false log-whitelist: - \(MON_DOWN\) conf: 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 24af33c0c6154..c57474dc3d18a 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -1,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false log-whitelist: - \(MON_DOWN\) 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 8ef2a99f053e9..38bdc74575cfd 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,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false log-whitelist: - \(MON_DOWN\) 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 3690affb0f209..4015ab76af0cb 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml @@ -1,6 +1,5 @@ overrides: ceph: - mon_bind_addrvec: false mon_bind_msgr2: false log-whitelist: - \(MON_DOWN\) 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 a531386257bd0..7e32e8c26b8eb 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,7 +1,6 @@ overrides: ceph: mon_bind_msgr2: false - mon_bind_addrvec: false log-whitelist: - \(MON_DOWN\) conf: -- 2.47.3