From 4156fd569f6ae591d0321ac4aaa65c2ee110f939 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 15 Jun 2022 13:45:48 +0200 Subject: [PATCH] nfs: use repo from SIG RPMs for nfs-ganesha aren't hosted anymore at https://download.ceph.com Signed-off-by: Guillaume Abrioux (cherry picked from commit 19fedfbac56ae9b9be966fc3206bf77e495c5c29) --- group_vars/all.yml.sample | 6 +++--- group_vars/rhcs.yml.sample | 6 +++--- roles/ceph-defaults/defaults/main.yml | 6 +++--- .../pre_requisite_non_container_red_hat.yml | 19 ++----------------- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 782156838..4958d5c66 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -161,11 +161,11 @@ dummy: #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha -#nfs_ganesha_stable_branch: V3.5-stable -#nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-3.0/ubuntu +#centos_release_nfs: centos-release-nfs-ganesha4 +#nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-4/ubuntu #nfs_ganesha_apt_keyserver: keyserver.ubuntu.com #nfs_ganesha_apt_key_id: EA914D611053D07BD332E18010353E8834DC57CA -#libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-3.0/ubuntu +#libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-4/ubuntu # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index a3e81ceff..2b5fef90f 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -161,11 +161,11 @@ ceph_repository: rhcs #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha -#nfs_ganesha_stable_branch: V3.5-stable -#nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-3.0/ubuntu +#centos_release_nfs: centos-release-nfs-ganesha4 +#nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-4/ubuntu #nfs_ganesha_apt_keyserver: keyserver.ubuntu.com #nfs_ganesha_apt_key_id: EA914D611053D07BD332E18010353E8834DC57CA -#libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-3.0/ubuntu +#libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-4/ubuntu # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 1c4b783c9..8de599a83 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -153,11 +153,11 @@ ceph_stable_release: quincy ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha -nfs_ganesha_stable_branch: V3.5-stable -nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-3.0/ubuntu +centos_release_nfs: centos-release-nfs-ganesha4 +nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-4/ubuntu nfs_ganesha_apt_keyserver: keyserver.ubuntu.com nfs_ganesha_apt_key_id: EA914D611053D07BD332E18010353E8834DC57CA -libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-3.0/ubuntu +libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-4/ubuntu # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml index 46a9e4f06..a57715c92 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_non_container_red_hat.yml @@ -8,24 +8,9 @@ - ceph_repository == 'community' block: - name: add nfs-ganesha stable repository - yum_repository: - name: nfs_ganesha_stable - description: nfs-ganesha stable repo - gpgcheck: yes + package: + name: "{{ centos_release_nfs }}" state: present - gpgkey: "{{ ceph_stable_key }}" - baseurl: "{{ ceph_mirror }}/nfs-ganesha/rpm-{{ nfs_ganesha_stable_branch }}/{{ ceph_release }}/el$releasever/$basearch" - file: nfs_ganesha_stable - - - name: add nfs-ganesha stable noarch repository - yum_repository: - name: nfs_ganesha_stable_noarch - description: nfs-ganesha stable noarch repo - gpgcheck: yes - state: present - gpgkey: "{{ ceph_stable_key }}" - baseurl: "{{ ceph_mirror }}/nfs-ganesha/rpm-{{ nfs_ganesha_stable_branch }}/{{ ceph_release }}/el$releasever/noarch" - file: nfs_ganesha_stable - name: red hat based systems - dev repo related tasks block: