From 193ce4f57291ed4731a6deb8ae49cae6f1cc7d5b Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 8 Jan 2020 10:54:42 -0500
Subject: [PATCH] ceph-iscsi: add ceph-iscsi stable repositories

This commit adds the support of the ceph-iscsi stable repository when
use ceph_repository community instead of always using the devel
repositories.
We're still using the devel repositories for rtslib and tcmu-runner in
both cases (dev and community).

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---
 .../tasks/non-container/prerequisites.yml     | 28 +++++++++++++++++--
 tests/functional/all_daemons/hosts            |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
index 59ebf268b..f3ed7e738 100644
--- a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
+++ b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
@@ -3,13 +3,14 @@
   set_fact:
     ceph_iscsi_repos:
       - ceph-iscsi-config
+      - ceph-iscsi-cli
+    common_iscsi_repos:
       - tcmu-runner
       - python-rtslib
-      - ceph-iscsi-cli
   when:
     - ansible_os_family == 'RedHat'
     - ceph_origin == 'repository'
-    - ceph_repository == 'dev'
+    - ceph_repository in ['dev', 'community']
     - ceph_iscsi_config_dev
 
 - name: fetch ceph-iscsi-config red hat development repository
@@ -17,7 +18,7 @@
     url: https://shaman.ceph.com/api/repos/{{ item }}/{{ ceph_dev_branch }}/{{ ceph_dev_sha1 }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/repo
     return_content: yes
   register: ceph_iscsi_config_dev_yum_repo
-  with_items: "{{ ceph_iscsi_repos }}"
+  with_items: "{{ ceph_iscsi_repos + common_iscsi_repos }}"
   when:
     - ansible_os_family == 'RedHat'
     - ceph_origin == 'repository'
@@ -40,6 +41,27 @@
     - ceph_repository == 'dev'
     - ceph_iscsi_config_dev
 
+- name: ceph-iscsi dependency repositories
+  get_url:
+    url: 'https://shaman.ceph.com/api/repos/{{ item }}/{{ ceph_dev_branch }}/{{ ceph_dev_sha1 }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/repo'
+    dest: '/etc/yum.repos.d/{{ item }}-dev.repo'
+    force: true
+  with_items: "{{ common_iscsi_repos }}"
+  when:
+    - ansible_os_family == 'RedHat'
+    - ceph_origin == 'repository'
+    - ceph_repository == 'community'
+
+- name: ceph-iscsi stable repository
+  get_url:
+    url: 'https://download.ceph.com/ceph-iscsi/2/rpm/el{{ ansible_distribution_major_version }}/ceph-iscsi.repo'
+    dest: /etc/yum.repos.d/ceph-iscsi.repo
+    force: true
+  when:
+    - ansible_os_family == 'RedHat'
+    - ceph_origin == 'repository'
+    - ceph_repository == 'community'
+
 - name: install redhat ceph iscsi package
   package:
     name: "{{ item }}"
diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 8f57cdb69..efc242d84 100644
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -29,7 +29,7 @@ nfs0
 rbd-mirror0
 
 [iscsigws]
-iscsi-gw0 ceph_repository="dev"
+iscsi-gw0
 
 [all:vars]
 nfs_ganesha_stable=True
-- 
2.39.5