ceph-volume tests do not include admin keyring in OSD nodes

Signed-off-by: Alfredo Deza <adeza@redhat.com>

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 2050c599074427d0b7f9f5906be4af84e0b5bab2..37e87be317d1f64ad953d2dcc8fca9b133c87336 100644 (file)
--- 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 90ad04d4218254481a38852eb773d9d6f47c6fc8..6f36f4922e4bba4fb2bb6dca8491436b31f152f8 100644 (file)
--- 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 f90d233d8c577e092ba18a1f00fc68e286bf70b7..af647e911c34a5150a89ff9db4913d9ba2388540 100644 (file)
--- 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 871523a2363dd65893da42b77933bb295e2608df..8cd6c48c195c7977bc5dd7d43349a18d652b943b 100644 (file)
--- 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 2050c599074427d0b7f9f5906be4af84e0b5bab2..37e87be317d1f64ad953d2dcc8fca9b133c87336 100644 (file)
--- 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 90ad04d4218254481a38852eb773d9d6f47c6fc8..6f36f4922e4bba4fb2bb6dca8491436b31f152f8 100644 (file)
--- 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 f90d233d8c577e092ba18a1f00fc68e286bf70b7..af647e911c34a5150a89ff9db4913d9ba2388540 100644 (file)
--- 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 871523a2363dd65893da42b77933bb295e2608df..8cd6c48c195c7977bc5dd7d43349a18d652b943b 100644 (file)
--- 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 560c8b03b172b5c71a1efcd69802fc15742de72b..c265e783b07d6e20aa5940c57582bac69a153896 100644 (file)
--- 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 83d24e0a0135afbf30847448f6f1cd2967106a6e..885c2c82f4e5d0f154adbd28ca14744ed45d68d2 100644 (file)
--- 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 674abc9390ce34b41a18da2d9903ce0d74707e5e..30bcf5be7c6f7317b926921f3c4f7e4ecd88328a 100644 (file)
--- 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 8902bdda37e9632c77ca1abc81c435e0d07eaf7b..7ab573b07e9a334be010f3ed2d90b0c686e1636c 100644 (file)
--- 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 c8ba0ba4c08b2d00b1df746eace86ab2449af35f..a27cfbad0c9fdceba1a280a73bfa8376637e334f 100644 (file)
--- 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 29e82024c7a7ead721f7cab446976585de5aaa5c..edac61b20650c0495ca9aadafa46d64cdd96d7af 100644 (file)
--- 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 560c8b03b172b5c71a1efcd69802fc15742de72b..c265e783b07d6e20aa5940c57582bac69a153896 100644 (file)
--- 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 83d24e0a0135afbf30847448f6f1cd2967106a6e..885c2c82f4e5d0f154adbd28ca14744ed45d68d2 100644 (file)
--- 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 674abc9390ce34b41a18da2d9903ce0d74707e5e..30bcf5be7c6f7317b926921f3c4f7e4ecd88328a 100644 (file)
--- 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 8902bdda37e9632c77ca1abc81c435e0d07eaf7b..7ab573b07e9a334be010f3ed2d90b0c686e1636c 100644 (file)
--- 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 c8ba0ba4c08b2d00b1df746eace86ab2449af35f..a27cfbad0c9fdceba1a280a73bfa8376637e334f 100644 (file)
--- 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 29e82024c7a7ead721f7cab446976585de5aaa5c..edac61b20650c0495ca9aadafa46d64cdd96d7af 100644 (file)
--- 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 }