tests: update container tag for ooo_collocation

It doesn't make sense to test the old 3.0.x container images with
nautilus+ ceph releases.
Also disable the dashboard deployment and switch to bluestore backend.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 3c2840da03)
pull/4666/head
Dimitri Savineau 2019-08-28 10:49:54 -04:00 committed by Guillaume Abrioux
parent b3ee07b242
commit bb2f139a1d
2 changed files with 3 additions and 8 deletions

View File

@ -12,10 +12,6 @@ all:
ceph_docker_image: ceph/daemon
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_data_pool:
name: 'manila_data'
pg_num: "{{ osd_pool_default_pg_num }}"
@ -49,7 +45,6 @@ all:
generate_fsid: false
ip_version: ipv4
ireallymeanit: 'yes'
journal_size: 512
keys:
- {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'}
@ -68,7 +63,6 @@ all:
- {name: backups, pg_num: 8, rule_name: ''}
- {name: vms, pg_num: 8, rule_name: ''}
- {name: volumes, pg_num: 8, rule_name: ''}
osd_objectstore: filestore
ceph_osd_docker_run_script_path: /opt
pools: []
public_network: 192.168.95.0/24
@ -76,6 +70,7 @@ all:
radosgw_civetweb_port: '8080'
radosgw_keystone_ssl: false
user_config: true
dashboard_enabled: false
clients:
hosts:
client0: {}

View File

@ -387,7 +387,7 @@ setenv=
UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
CEPH_STABLE_RELEASE = nautilus
ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
ooo_collocation: CEPH_DOCKER_IMAGE_TAG = latest-nautilus
deps= -r{toxinidir}/tests/requirements.txt
changedir=
all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
@ -421,7 +421,7 @@ commands=
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
# configure lvm
!lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
!lvm_batch-!lvm_auto_discovery-!ooo_collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml