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 <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-03-28 11:19:05 -05:00
parent 9de36ffdf0
commit e58bf34386
9 changed files with 30 additions and 5 deletions

View File

@ -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:

View File

@ -1,5 +1,6 @@
overrides:
ceph:
mon_bind_addrvec: false
mon_bind_msgr2: false
conf:
global:

View File

@ -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

View File

@ -1,6 +1,7 @@
overrides:
ceph:
mon_bind_msgr2: false
mon_bind_addrvec: false
conf:
global:
ms type: async

View File

@ -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

View File

@ -1,5 +1,6 @@
overrides:
ceph:
mon_bind_addrvec: false
mon_bind_msgr2: false
conf:
global:

View File

@ -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

View File

@ -1,6 +1,7 @@
overrides:
ceph:
mon_bind_msgr2: false
mon_bind_addrvec: false
conf:
global:
ms type: async

View File

@ -1,7 +1,2 @@
tasks:
- ceph:
mon_bind_addrvec: false
mon_bind_msgr2: false
conf:
global:
ms bind msgr2: false