mirror of https://github.com/ceph/ceph-ansible.git
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>pull/4786/head
parent
d606ad0bac
commit
193ce4f572
|
@ -3,13 +3,14 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
ceph_iscsi_repos:
|
ceph_iscsi_repos:
|
||||||
- ceph-iscsi-config
|
- ceph-iscsi-config
|
||||||
|
- ceph-iscsi-cli
|
||||||
|
common_iscsi_repos:
|
||||||
- tcmu-runner
|
- tcmu-runner
|
||||||
- python-rtslib
|
- python-rtslib
|
||||||
- ceph-iscsi-cli
|
|
||||||
when:
|
when:
|
||||||
- ansible_os_family == 'RedHat'
|
- ansible_os_family == 'RedHat'
|
||||||
- ceph_origin == 'repository'
|
- ceph_origin == 'repository'
|
||||||
- ceph_repository == 'dev'
|
- ceph_repository in ['dev', 'community']
|
||||||
- ceph_iscsi_config_dev
|
- ceph_iscsi_config_dev
|
||||||
|
|
||||||
- name: fetch ceph-iscsi-config red hat development repository
|
- 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
|
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
|
return_content: yes
|
||||||
register: ceph_iscsi_config_dev_yum_repo
|
register: ceph_iscsi_config_dev_yum_repo
|
||||||
with_items: "{{ ceph_iscsi_repos }}"
|
with_items: "{{ ceph_iscsi_repos + common_iscsi_repos }}"
|
||||||
when:
|
when:
|
||||||
- ansible_os_family == 'RedHat'
|
- ansible_os_family == 'RedHat'
|
||||||
- ceph_origin == 'repository'
|
- ceph_origin == 'repository'
|
||||||
|
@ -40,6 +41,27 @@
|
||||||
- ceph_repository == 'dev'
|
- ceph_repository == 'dev'
|
||||||
- ceph_iscsi_config_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
|
- name: install redhat ceph iscsi package
|
||||||
package:
|
package:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
|
|
|
@ -29,7 +29,7 @@ nfs0
|
||||||
rbd-mirror0
|
rbd-mirror0
|
||||||
|
|
||||||
[iscsigws]
|
[iscsigws]
|
||||||
iscsi-gw0 ceph_repository="dev"
|
iscsi-gw0
|
||||||
|
|
||||||
[all:vars]
|
[all:vars]
|
||||||
nfs_ganesha_stable=True
|
nfs_ganesha_stable=True
|
||||||
|
|
Loading…
Reference in New Issue