From 781ab4ad620579c9d89dbbc2fb5acdd361c25739 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 21 Aug 2019 21:45:57 +0200 Subject: [PATCH] openSUSE OBS repo using ceph_stable_release Instead of hardcoding `luminous`, use the `ceph_stable_release` variable to point to the correct repository. This is now uncommented in roles/ceph-defaults/defaults/main.yml to be available, as it is only used if ceph_repository is set to 'obs'. group_vars/*.sample files have been regenerated using the ./generate_group_vars_sample.sh script. Signed-off-by: Johannes Kastl (cherry picked from commit 0cedc4d3030d6859935609a055a08d87f44e3354) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index ab26caa9e..0f54a0518 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -209,7 +209,7 @@ dummy: # usually has newer Ceph releases than the normal distro repository. # # -#ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/luminous/openSUSE_Leap_{{ ansible_distribution_version }}/" +#ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{ ceph_stable_release }}/openSUSE_Leap_{{ ansible_distribution_version }}/" # REPOSITORY: DEV # diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 2442a5335..515db4b41 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -209,7 +209,7 @@ ceph_rhcs_version: 4 # usually has newer Ceph releases than the normal distro repository. # # -#ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/luminous/openSUSE_Leap_{{ ansible_distribution_version }}/" +#ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{ ceph_stable_release }}/openSUSE_Leap_{{ ansible_distribution_version }}/" # REPOSITORY: DEV # diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index e72d07271..27b7f650c 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -201,7 +201,7 @@ ceph_stable_release_uca: "{{ ansible_distribution_release }}-updates/{{ ceph_sta # usually has newer Ceph releases than the normal distro repository. # # -#ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/luminous/openSUSE_Leap_{{ ansible_distribution_version }}/" +ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{ ceph_stable_release }}/openSUSE_Leap_{{ ansible_distribution_version }}/" # REPOSITORY: DEV #