iscsi-gw: move repository configuration to ceph-iscsi-gw

This is something that has nothing to do in `ceph-common`, this
is too specific to `ceph-iscsi-gw` role.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
index 5bf6d2c99b68f406ec942d69ecc94f2eb94e1c9c..6bc4b065b3dc1e710ee0ad8f360159275dd0a4b6 100644 (file)
--- a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
+++ b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml
@@ -12,36 +12,3 @@
     owner: root
     group: root
     backup: yes
-
-- name: set_fact ceph_iscsi_repos
-  set_fact:
-    ceph_iscsi_repos:
-      - ceph-iscsi-config
-      - tcmu-runner
-  when:
-    - ceph_iscsi_config_dev
-    - iscsi_gw_group_name in group_names
-
-- name: fetch ceph-iscsi-config red hat development repository
-  uri:
-    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 }}"
-  when:
-    - ceph_iscsi_config_dev
-    - iscsi_gw_group_name in group_names
-
-- name: configure ceph-iscsi-config red hat development repository
-  copy:
-    content: "{{ item.0.content }}"
-    dest: "/etc/yum.repos.d/{{ item.1 }}-dev.repo"
-    owner: root
-    group: root
-    backup: yes
-  with_together:
-    - "{{ ceph_iscsi_config_dev_yum_repo.results }}"
-    - "{{ ceph_iscsi_repos }}"
-  when:
-    - ceph_iscsi_config_dev
-    - iscsi_gw_group_name in group_names

diff --git a/roles/ceph-iscsi-gw/tasks/prerequisites.yml b/roles/ceph-iscsi-gw/tasks/prerequisites.yml
index 3f7ef97a186bd89b7ea4e5c4944f616fd3702c46..34748853115340fd666ddb433711ba36c3987242 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/prerequisites.yml
+++ b/roles/ceph-iscsi-gw/tasks/prerequisites.yml
@@ -1,4 +1,43 @@
 ---
+- name: set_fact ceph_iscsi_repos
+  set_fact:
+    ceph_iscsi_repos:
+      - ceph-iscsi-config
+      - tcmu-runner
+  when:
+    - ansible_os_family == 'RedHat'
+    - ceph_origin == 'repository'
+    - ceph_repository == 'dev'
+    - ceph_iscsi_config_dev
+
+- name: fetch ceph-iscsi-config red hat development repository
+  uri:
+    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 }}"
+  when:
+    - ansible_os_family == 'RedHat'
+    - ceph_origin == 'repository'
+    - ceph_repository == 'dev'
+    - ceph_iscsi_config_dev
+
+- name: configure ceph-iscsi-config red hat development repository
+  copy:
+    content: "{{ item.0.content }}"
+    dest: "/etc/yum.repos.d/{{ item.1 }}-dev.repo"
+    owner: root
+    group: root
+    backup: yes
+  with_together:
+    - "{{ ceph_iscsi_config_dev_yum_repo.results }}"
+    - "{{ ceph_iscsi_repos }}"
+  when:
+    - ansible_os_family == 'RedHat'
+    - ceph_origin == 'repository'
+    - ceph_repository == 'dev'
+    - ceph_iscsi_config_dev
+
 - name: install redhat ceph iscsi package
   package:
     name: "{{ item }}"