From 33773388a1d7d12ea2daf4fc7a580c2d1536619b Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 3 Jun 2020 12:34:34 +1000
Subject: [PATCH] openafs-client: arch fixes
The lookup() happens on the local host, not the remote host. ergo we
were never using the Debian.aarch64.yaml file in production anyway
(where bridge is x86 so includes only the x86 file).
So clearly it is not necessary; as we have production ARM64 mirrors
using the base file. This is OK because we build the packages in the
PPA for x86 and arm64.
We can drop openafs_client_apt_repo which isn't used any more.
Follow-on will improve the testing of this.
Change-Id: I298cdfefc813006f7f4218dd37015992556c8498
---
roles/openafs-client/README.rst | 10 ++----
roles/openafs-client/tasks/main.yaml | 2 --
.../tasks/openafs-client/Debian.aarch64.yaml | 33 -------------------
.../tasks/openafs-client/Debian.yaml | 3 +-
roles/openafs-client/vars/Debian.yaml | 4 ---
5 files changed, 4 insertions(+), 48 deletions(-)
delete mode 100644 roles/openafs-client/tasks/openafs-client/Debian.aarch64.yaml
diff --git a/roles/openafs-client/README.rst b/roles/openafs-client/README.rst
index de2c9a63b9..11556a921b 100644
--- a/roles/openafs-client/README.rst
+++ b/roles/openafs-client/README.rst
@@ -12,8 +12,8 @@ on distribution internals, kernel versions and host architecture this
role has limited platform support. Currently supported are
* Debian family with system packages available
-* Ubuntu Xenial with ARM64, with external 1.8 series packages
-* CentOS 7 with external packages
+* Ubuntu LTS family with external 1.8 series packages
+* CentOS 7 and 8 with external packages
**Role Variables**
@@ -43,9 +43,3 @@ role has limited platform support. Currently supported are
:default: no
Enable or disable gpg checking for ``openafs_yum_repo_url``
-
-.. zuul:rolevar:: openafs_client_apt_repo
- :default: ppa:openstack-ci-core/openafs-arm64
-
- Source string for APT repository for Debian family hosts requiring
- external packages (currently ARM64)
diff --git a/roles/openafs-client/tasks/main.yaml b/roles/openafs-client/tasks/main.yaml
index 04bc4ab819..829ed9c97c 100644
--- a/roles/openafs-client/tasks/main.yaml
+++ b/roles/openafs-client/tasks/main.yaml
@@ -3,7 +3,6 @@
vars:
params:
files:
- - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
- "{{ ansible_distribution }}.{{ ansible_distribution_major_version }}.yaml"
- "{{ ansible_distribution }}.yaml"
- "{{ ansible_os_family }}.yaml"
@@ -59,7 +58,6 @@
vars:
params:
files:
- - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
- "{{ ansible_distribution }}.yaml"
- "{{ ansible_os_family }}.yaml"
- "default.yaml"
diff --git a/roles/openafs-client/tasks/openafs-client/Debian.aarch64.yaml b/roles/openafs-client/tasks/openafs-client/Debian.aarch64.yaml
deleted file mode 100644
index f48fa4856b..0000000000
--- a/roles/openafs-client/tasks/openafs-client/Debian.aarch64.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# ARM64 Bionic missed having fixes in before release. It is first
-# supported in openafs 1.8.1; there are some proposed updates now
-# upstream has support merged and released. To remove this gate, we
-# should ideally be able to grab the packages from upstream, or
-# otherwise have tested this somewhere other than Xenial. This is
-# left as future work.
-- name: Check Xenial support
- fail:
- msg: "ARM64 only supported on Xenial"
- when: ansible_distribution_major_version != '16'
-
-- name: Add OpenStack ARM64 openafs-client PPA
- apt_repository:
- repo: '{{ openafs_client_apt_repo }}'
- become: yes
-
-# Only tested with the updated HWE kernel for Xenial
-- name: Install kernel packages
- package:
- name:
- - linux-generic-hwe-16.04
- - linux-headers-generic-hwe-16.04
- - openafs-modules-dkms
- state: present
- become: yes
-
-- name: Install openafs packages
- package:
- name:
- - openafs-client
- - openafs-krb5
- state: present
- become: yes
diff --git a/roles/openafs-client/tasks/openafs-client/Debian.yaml b/roles/openafs-client/tasks/openafs-client/Debian.yaml
index efea5a647d..43716ca602 100644
--- a/roles/openafs-client/tasks/openafs-client/Debian.yaml
+++ b/roles/openafs-client/tasks/openafs-client/Debian.yaml
@@ -1,4 +1,5 @@
-# Bionic version is dangerously out of date; use later version.
+# 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
- name: Install openstackci openafs PPA
apt_repository:
diff --git a/roles/openafs-client/vars/Debian.yaml b/roles/openafs-client/vars/Debian.yaml
index 88394462d4..d00ff855db 100644
--- a/roles/openafs-client/vars/Debian.yaml
+++ b/roles/openafs-client/vars/Debian.yaml
@@ -1,5 +1 @@
openafs_client_config_path: '/etc/openafs'
-# ARM64 wasn't supported in openafs until
-# https://gerrit.openafs.org/11940
-# This custom PPA has 1.8.x packages with these patches
-openafs_client_apt_repo: ppa:openstack-ci-core/openafs-arm64