ceph-iscsi: don't use ceph_dev_xxx variables

Using ceph_dev_branch and ceph_dev_sha1 for configuring ceph-iscsi
repositories from shaman doesn't make sense because the ceph devel
branches and sha1 aren't compatible with ceph-iscsi devel.
Instead we could rely on the master branch and the latest sha1.
Currently it's not possible to using a custom ceph branch/sha1 value
with iscsi setup otherwise the repository setup will fail.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
pull/5054/head
Dimitri Savineau 2020-02-06 16:31:39 -05:00 committed by Guillaume Abrioux
parent 10951eeea8
commit 6dd9b25565
1 changed files with 2 additions and 2 deletions

View File

@ -31,14 +31,14 @@
block:
- 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'
url: 'https://shaman.ceph.com/api/repos/{{ item }}/master/latest/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/repo'
dest: '/etc/yum.repos.d/{{ item }}-dev.repo'
force: true
with_items: "{{ common_repos }}"
- name: ceph-iscsi development repository
get_url:
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 }}/master/latest/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/repo'
dest: '/etc/yum.repos.d/{{ item }}-dev.repo'
force: true
with_items: '{{ iscsi_base }}'