From 28d21b4e9c13566855844e9d5da71e2c4ef80894 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 7 Jun 2018 16:11:39 +0200 Subject: [PATCH] tests: update ooo inventory hostfile Update the inventory host for tripleo testing scenario so it's the same parameters than in tripleo CI. Signed-off-by: Guillaume Abrioux --- .../functional/centos/7/ooo-collocation/hosts | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/tests/functional/centos/7/ooo-collocation/hosts b/tests/functional/centos/7/ooo-collocation/hosts index b1271e1b7..209280b23 100644 --- a/tests/functional/centos/7/ooo-collocation/hosts +++ b/tests/functional/centos/7/ooo-collocation/hosts @@ -6,15 +6,16 @@ all: rgw_keystone_accepted_roles: 'Member, admin', rgw_keystone_admin_domain: default, rgw_keystone_admin_password: RtYPg7AUdsZCGv4Z4rF8FvnaR, rgw_keystone_admin_project: service, rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true', - rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true'} + rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0} + ceph_mgr_docker_extra_env: '-e MGR_DASHBOARD=0' + cluster: mycluster ceph_docker_image: ceph/daemon - ceph_docker_image_tag: tag-stable-3.0-luminous-centos-7 + ceph_docker_image_tag: v3.0.3-stable-3.0-luminous-centos-7-x86_64 ceph_docker_registry: docker.io ceph_origin: repository ceph_repository: community ceph_release: luminous ceph_stable: true - cephfs: cephfs cephfs_data: manila_data cephfs_metadata: manila_metadata cephfs_pools: @@ -30,27 +31,17 @@ all: ireallymeanit: 'yes' journal_size: 512 keys: - - {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 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 + - {key: AQAN0RdbAAAAABAA3CpSKRVDrENjkOSunEFZ0A==, 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: AQAN0RdbAAAAABAAtV5Dq28z4H6XxwhaNEaFZg==, 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: AQAN0RdbAAAAABAAH5D3WgMN9Rxw3M8jkpMIfg==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow rw', name: client.radosgw, osd_cap: 'allow rwx'} monitor_address_block: 192.168.95.0/24 monitor_secret: AQBSV4xaAAAAABAALqm4vRHcITs4/041TwluMg== ntp_service_enabled: false openstack_config: true openstack_keys: - - {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" }, mode: '0600', name: client.manila} - - {key: AQBSV4xaAAAAABAADyV1zQEcxTPs9QegC1MlMw==, caps: { mgr: "allow *", mon: "allow rw", osd: "allow rwx"}, mode: '0600', - name: client.radosgw} + - {key: AQAN0RdbAAAAABAA3CpSKRVDrENjkOSunEFZ0A==, 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: AQAN0RdbAAAAABAAtV5Dq28z4H6XxwhaNEaFZg==, 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: AQAN0RdbAAAAABAAH5D3WgMN9Rxw3M8jkpMIfg==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow rw', name: client.radosgw, osd_cap: 'allow rwx'} openstack_pools: - {name: images, pg_num: 8, rule_name: ''} - {name: metrics, pg_num: 8, rule_name: ''} @@ -66,12 +57,6 @@ all: radosgw_civetweb_port: '8080' radosgw_keystone_ssl: false user_config: true - copy_admin_key: true - rgw_create_pools: - foo: - pg_num: 17 - bar: - pg_num: 19 clients: hosts: client0: {} -- 2.39.5