openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix focal ceph jobs"

Browse Source
This commit is contained in:
Zuul 2020-10-13 11:32:43 +00:00 committed by Gerrit Code Review
commit 9bd256850b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/group_vars/ceph_all.yml
View File

@ -38,7 +38,7 @@ ceph_conf_overrides: "{{ (ceph_conf_overrides_rgw | default({})) | combine(ceph_
# needed.
nfs_file_gw: "{{ (('ceph-nfs' in groups) and ('ceph-mds' in groups)) }}"
nfs_obj_gw: False
nfs_ganesha_stable: "{{ (ansible_distribution_release != 'bionic') }}"
nfs_ganesha_stable: "{{ (ansible_distribution_release not in ['bionic', 'focal']) }}"
# NTP in an OSA environment is handled by ansible-hardening using chrony
# ceph-ansible's default enabling of ntpd conflicts with the OSA defaults

9
zuul.d/project-templates.yaml
View File

@ -145,16 +145,13 @@
name: openstack-ansible-deploy-ceph-jobs
check:
jobs:
- openstack-ansible-deploy-aio_ceph-ubuntu-bionic
- openstack-ansible-deploy-aio_ceph-ubuntu-focal:
voting: false
- openstack-ansible-deploy-aio_ceph-ubuntu-focal
gate:
jobs:
- openstack-ansible-deploy-aio_ceph-ubuntu-bionic
- openstack-ansible-deploy-aio_ceph-ubuntu-focal
periodic:
jobs:
- openstack-ansible-deploy-aio_ceph-ubuntu-bionic
- openstack-ansible-upgrade-aio_ceph-ubuntu-bionic
- openstack-ansible-deploy-aio_ceph-ubuntu-focal
- project-template:
name: openstack-ansible-deploy-proxy-jobs