From ed5ecab20bbf9bfa9668a53fc10586b3dc0c8c29 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 22 Sep 2020 18:13:30 +0300 Subject: [PATCH] Fix focal ceph jobs This aims to fix focal ceph jobs and also replace bionic jobs in project-template Change-Id: I892ece511f0e070e4e4f6284a2c11b3129c0261b --- inventory/group_vars/ceph_all.yml | 2 +- zuul.d/project-templates.yaml | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/inventory/group_vars/ceph_all.yml b/inventory/group_vars/ceph_all.yml index a790e4abf7..c33493f687 100644 --- a/inventory/group_vars/ceph_all.yml +++ b/inventory/group_vars/ceph_all.yml @@ -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 diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index db9576de21..a45216579c 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -118,16 +118,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