From dfff89ce67c4e29007e8cbe21e74d94d85b7c0bc Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Fri, 25 Jan 2019 15:45:21 +0530 Subject: [PATCH] Install nfs-ganesha stable v2.7 nfs-ganesha v2.5 and 2.6 have hit EOL. Install nfs-ganesha v2.7 stable that is currently being maintained. Signed-off-by: Ramana Raja --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- tests/functional/all_daemons/hosts | 4 ++-- tests/functional/all_daemons/hosts-ubuntu | 4 ++-- tests/functional/shrink_mon/hosts-ubuntu | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index e69f2fda9..8c4f20c5a 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -159,7 +159,7 @@ dummy: #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha -#nfs_ganesha_stable_branch: V2.6-stable +#nfs_ganesha_stable_branch: V2.7-stable #nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 5a6f17285..95fd21b2c 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -159,7 +159,7 @@ 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: V2.6-stable +#nfs_ganesha_stable_branch: V2.7-stable #nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 7ff5994d1..210499a08 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -151,7 +151,7 @@ ceph_stable_release: dummy ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha -nfs_ganesha_stable_branch: V2.6-stable +nfs_ganesha_stable_branch: V2.7-stable nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts index 86b1c014e..3f8cafbe8 100644 --- a/tests/functional/all_daemons/hosts +++ b/tests/functional/all_daemons/hosts @@ -29,5 +29,5 @@ iscsi-gw0 ceph_repository="dev" [all:vars] nfs_ganesha_stable=True nfs_ganesha_dev=False -nfs_ganesha_stable_branch="V2.5-stable" -nfs_ganesha_flavor="ceph_master" \ No newline at end of file +nfs_ganesha_stable_branch="V2.7-stable" +nfs_ganesha_flavor="ceph_master" diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu index e9bd37682..19fff7bf2 100644 --- a/tests/functional/all_daemons/hosts-ubuntu +++ b/tests/functional/all_daemons/hosts-ubuntu @@ -29,7 +29,7 @@ iscsi-gw0 ceph_repository="dev" [all:vars] debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] nfs_ganesha_stable=True -nfs_ganesha_stable_branch="V2.5-stable" +nfs_ganesha_stable_branch="V2.7-stable" nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" nfs_ganesha_dev=False -nfs_ganesha_flavor="ceph_master" \ No newline at end of file +nfs_ganesha_flavor="ceph_master" diff --git a/tests/functional/shrink_mon/hosts-ubuntu b/tests/functional/shrink_mon/hosts-ubuntu index eebaf4e8e..7e562adb7 100644 --- a/tests/functional/shrink_mon/hosts-ubuntu +++ b/tests/functional/shrink_mon/hosts-ubuntu @@ -29,7 +29,7 @@ iscsi-gw0 ceph_repository="dev" [all:vars] debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] nfs_ganesha_stable=True -nfs_ganesha_stable_branch="V2.5-stable" +nfs_ganesha_stable_branch="V2.7-stable" nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" nfs_ganesha_dev=False -nfs_ganesha_flavor="ceph_master" \ No newline at end of file +nfs_ganesha_flavor="ceph_master" -- 2.39.5