diff --git a/tests/functional/centos/7/ooo-collocation/hosts b/tests/functional/centos/7/ooo-collocation/hosts
index bbef74527..72521a6a0 100644
--- a/tests/functional/centos/7/ooo-collocation/hosts
+++ b/tests/functional/centos/7/ooo-collocation/hosts
@@ -30,16 +30,12 @@ all:
     ireallymeanit: 'yes'
     journal_size: 512
     keys:
-    - {key: AQBSV4xaAAAAABAAmtVVVGQiKWNQ+OC6VxByFg==, mgr_cap: allow *, mode: '0600',
-      mon_cap: allow r, name: client.openstack, osd_cap: 'allow class-read object_prefix
+    - {key: AQBSV4xaAAAAABAAmtVVVGQiKWNQ+OC6VxByFg==, caps: { mgr: "allow *", mon: "allow r", osd: "allow class-read object_prefix
         rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms,
-        allow rwx pool=images, allow rwx pool=metrics'}
-    - {key: AQBSV4xaAAAAABAAXiRF4aNQbrXMZhdODHQ8QA==, mds_cap: allow *, mgr_cap: allow
-        *, mode: '0600', mon_cap: 'allow r, allow command \\\"auth del\\\", allow
-        command \\\"auth caps\\\", allow command \\\"auth get\\\", allow command \\\"auth
-        get-or-create\\\"', name: client.manila, osd_cap: allow rw}
-    - {key: AQBSV4xaAAAAABAADyV1zQEcxTPs9QegC1MlMw==, mgr_cap: allow *, mode: '0600',
-      mon_cap: allow rw, name: client.radosgw, osd_cap: allow rwx}
+        allow rwx pool=images, allow rwx pool=metrics"}, mode: '0600', name: client.openstack}
+    - {key: AQBSV4xaAAAAABAAXiRF4aNQbrXMZhdODHQ8QA==, caps: { mds: "allow *", mgr: "allow r", mon: "allow r, allow command \\\"auth del\\\", allow
+        command \\\"auth caps\\\", allow command \\\"auth get\\\", allow command \\\"auth get-or-create\\\"", osd: "allow rw" }, name: client.manila}
+    - {key: AQBSV4xaAAAAABAADyV1zQEcxTPs9QegC1MlMw==, caps: { mgr: "allow *", mon: "allow rw", osd: "allow rwx" }, mode: '0600', name: client.radosgw}
     mds_use_fqdn: false
     mon_use_fqdn: false
     monitor_address_block: 192.168.95.0/24
@@ -47,16 +43,14 @@ all:
     ntp_service_enabled: false
     openstack_config: true
     openstack_keys:
-    - {key: AQBSV4xaAAAAABAAmtVVVGQiKWNQ+OC6VxByFg==, mgr_cap: allow *, mode: '0600',
-      mon_cap: allow r, name: client.openstack, osd_cap: 'allow class-read object_prefix
-        rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms,
-        allow rwx pool=images, allow rwx pool=metrics'}
-    - {key: AQBSV4xaAAAAABAAXiRF4aNQbrXMZhdODHQ8QA==, mds_cap: allow *, mgr_cap: allow
-        *, mode: '0600', mon_cap: 'allow r, allow command \\\"auth del\\\", allow
+    - {key: AQBSV4xaAAAAABAAmtVVVGQiKWNQ+OC6VxByFg==, caps: { mgr: "allow *", mon: "allow r", osd: "allow class-read object_prefix
+    rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms,
+    allow rwx pool=images, allow rwx pool=metrics" }, mode: '0600', name: client.openstack}
+    - {key: AQBSV4xaAAAAABAAXiRF4aNQbrXMZhdODHQ8QA==, caps: { mds: "allow *", mgr: "allow *", mon: "allow r, allow command \\\"auth del\\\", allow
         command \\\"auth caps\\\", allow command \\\"auth get\\\", allow command \\\"auth
-        get-or-create\\\"', name: client.manila, osd_cap: allow rw}
-    - {key: AQBSV4xaAAAAABAADyV1zQEcxTPs9QegC1MlMw==, mgr_cap: allow *, mode: '0600',
-      mon_cap: allow rw, name: client.radosgw, osd_cap: allow rwx}
+        get-or-create" }, mode: '0600', name: client.manila}
+    - {key: AQBSV4xaAAAAABAADyV1zQEcxTPs9QegC1MlMw==, caps: { mgr: "allow *", mon: "allow rw", osd: "allow rwx"}, mode: '0600',
+        name: client.radosgw}
     openstack_pools:
     - {name: images, pg_num: 8, rule_name: ''}
     - {name: metrics, pg_num: 8, rule_name: ''}
@@ -73,6 +67,7 @@ all:
     radosgw_keystone: true
     radosgw_keystone_ssl: false
     user_config: true
+    copy_admin_key: true
 clients:
   hosts:
     client0: {}