From c6d537f565a37e9c5afbe08c149771041c4c1bcc Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 11 Jun 2020 16:16:31 +1000 Subject: [PATCH] openafs-client: Use PPA for Xenial ARM64 Xenial ARM64 doesn't have openafs-client built; we have 1.8.5 built in our PPA. Leave our production Xenial x86_64 systems with the inbuilt 1.6 client until we've thought about AFS server upgrades. Change-Id: I7dad812a714133ffe54d4ecc1978f09abb39eb72 --- .../openafs-client/tasks/openafs-client/Debian.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/openafs-client/tasks/openafs-client/Debian.yaml b/roles/openafs-client/tasks/openafs-client/Debian.yaml index 43716ca602..2b56bd82c5 100644 --- a/roles/openafs-client/tasks/openafs-client/Debian.yaml +++ b/roles/openafs-client/tasks/openafs-client/Debian.yaml @@ -1,10 +1,15 @@ -# Bionic and Focal versions both shipped unstable ~pre versions -# of openafs clients; we thus have stable versions in a PPA. -# https://bugs.launchpad.net/ubuntu/+source/openafs/+bug/1832690 +# Bionic and Focal versions both shipped unstable ~pre versions of +# openafs clients; we thus have stable versions in a PPA. We use this +# everywhere but our legacy Xenial x86 hosts (Debian stable has 1.8 +# inbuilt so we are good there). +# https://bugs.launchpad.net/ubuntu/+source/openafs/+bug/1832690 - name: Install openstackci openafs PPA apt_repository: repo: 'ppa:openstack-ci-core/openafs' - when: ansible_distribution_version is version('18.04', '>=') + when: + - ansible_distribution == 'Ubuntu' and not + ( ansible_distribution_version is version('16.04', '==') and + ansible_architecture == 'x86_64' ) become: yes - name: Install kernel headers dependency