From: Dimitri Savineau Date: Thu, 6 Feb 2020 21:31:39 +0000 (-0500) Subject: ceph-iscsi: don't use ceph_dev_xxx variables X-Git-Tag: v6.0.0alpha1~63 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dd9b255656b7124f8963cf65a862930fa28d162;p=ceph-ansible.git 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 --- diff --git a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml index 58cbe190b..d132cb98d 100644 --- a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml +++ b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml @@ -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 }}'