From 58988fe3c4f7723cc20cfc067aac05e892e056e2 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 4 Jun 2018 16:01:15 -0400 Subject: [PATCH] ceph-volume tests do not include admin keyring in OSD nodes Signed-off-by: Alfredo Deza (cherry picked from commit 08760632743040520588e1bc03adc17746ff2eca) --- .../functional/lvm/centos7/bluestore/create/group_vars/all | 2 +- .../functional/lvm/centos7/bluestore/dmcrypt/group_vars/all | 2 +- .../functional/lvm/centos7/filestore/create/group_vars/all | 2 +- .../functional/lvm/centos7/filestore/dmcrypt/group_vars/all | 2 +- .../tests/functional/lvm/xenial/bluestore/create/group_vars/all | 2 +- .../functional/lvm/xenial/bluestore/dmcrypt/group_vars/all | 2 +- .../tests/functional/lvm/xenial/filestore/create/group_vars/all | 2 +- .../functional/lvm/xenial/filestore/dmcrypt/group_vars/all | 2 +- .../functional/simple/centos7/bluestore/activate/group_vars/all | 2 +- .../simple/centos7/bluestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/centos7/bluestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/centos7/filestore/activate/group_vars/all | 2 +- .../simple/centos7/filestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/centos7/filestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/xenial/bluestore/activate/group_vars/all | 2 +- .../simple/xenial/bluestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/xenial/bluestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/xenial/filestore/activate/group_vars/all | 2 +- .../simple/xenial/filestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/xenial/filestore/dmcrypt-plain/group_vars/all | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all index 2050c59907442..37e87be317d1f 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all @@ -10,7 +10,7 @@ osd_objectstore: "bluestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false lvm_volumes: - data: data-lv1 data_vg: test_group diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all index 90ad04d421825..6f36f4922e4bb 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all @@ -11,7 +11,7 @@ osd_objectstore: "bluestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false lvm_volumes: - data: data-lv1 data_vg: test_group diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all index f90d233d8c577..af647e911c34a 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all @@ -10,7 +10,7 @@ osd_objectstore: "filestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all index 871523a2363dd..8cd6c48c195c7 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all @@ -11,7 +11,7 @@ osd_objectstore: "filestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/create/group_vars/all index 2050c59907442..37e87be317d1f 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/create/group_vars/all @@ -10,7 +10,7 @@ osd_objectstore: "bluestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false lvm_volumes: - data: data-lv1 data_vg: test_group diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/group_vars/all index 90ad04d421825..6f36f4922e4bb 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/group_vars/all @@ -11,7 +11,7 @@ osd_objectstore: "bluestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false lvm_volumes: - data: data-lv1 data_vg: test_group diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/create/group_vars/all index f90d233d8c577..af647e911c34a 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/create/group_vars/all @@ -10,7 +10,7 @@ osd_objectstore: "filestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/group_vars/all index 871523a2363dd..8cd6c48c195c7 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/group_vars/all @@ -11,7 +11,7 @@ osd_objectstore: "filestore" osd_scenario: lvm ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all index 560c8b03b172b..c265e783b07d6 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all @@ -9,7 +9,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all index 83d24e0a0135a..885c2c82f4e5d 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all index 674abc9390ce3..30bcf5be7c6f7 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all index 8902bdda37e96..7ab573b07e9a3 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all @@ -9,7 +9,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all index c8ba0ba4c08b2..a27cfbad0c9fd 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all index 29e82024c7a7e..edac61b20650c 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all index 560c8b03b172b..c265e783b07d6 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all @@ -9,7 +9,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all index 83d24e0a0135a..885c2c82f4e5d 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all index 674abc9390ce3..30bcf5be7c6f7 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "bluestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all index 8902bdda37e96..7ab573b07e9a3 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all @@ -9,7 +9,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all index c8ba0ba4c08b2..a27cfbad0c9fd 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all index 29e82024c7a7e..edac61b20650c 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all @@ -10,7 +10,7 @@ journal_size: 100 osd_objectstore: "filestore" ceph_origin: 'repository' ceph_repository: 'dev' -copy_admin_key: true +copy_admin_key: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } -- 2.39.5