From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 4 Jun 2018 20:01:15 +0000 (-0400)
Subject: ceph-volume tests do not include admin keyring in OSD nodes
X-Git-Tag: v13.2.1~137^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22425%2Fhead;p=ceph.git

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

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 08760632743040520588e1bc03adc17746ff2eca)
---

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 2050c5990744..37e87be317d1 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 90ad04d42182..6f36f4922e4b 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 f90d233d8c57..af647e911c34 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 871523a2363d..8cd6c48c195c 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 2050c5990744..37e87be317d1 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 90ad04d42182..6f36f4922e4b 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 f90d233d8c57..af647e911c34 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 871523a2363d..8cd6c48c195c 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 560c8b03b172..c265e783b07d 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 83d24e0a0135..885c2c82f4e5 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 674abc9390ce..30bcf5be7c6f 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 8902bdda37e9..7ab573b07e9a 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 c8ba0ba4c08b..a27cfbad0c9f 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 29e82024c7a7..edac61b20650 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 560c8b03b172..c265e783b07d 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 83d24e0a0135..885c2c82f4e5 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 674abc9390ce..30bcf5be7c6f 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 8902bdda37e9..7ab573b07e9a 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 c8ba0ba4c08b..a27cfbad0c9f 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 29e82024c7a7..edac61b20650 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 }