From 32fed8dbd26ba4958b006945279827c5577c8e18 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Fri, 24 May 2019 13:58:05 +0800 Subject: [PATCH] ceph: stop adding repos The ceph-ansible playbooks already take care of setting up the keys and installing the repositories. It also do it in a more cleaner, overridable way, so let's let it do it's own thing[0]. [0]: https://github.com/ceph/ceph-ansible/tree/739a662c8084a80cf5565640556389d2b59c7daa/roles/ceph-common/tasks/installs Change-Id: I597a2532f370faeeae301eb557fc71d2326d58a2 --- playbooks/common-tasks/ceph-server.yml | 36 -------------------------- 1 file changed, 36 deletions(-) diff --git a/playbooks/common-tasks/ceph-server.yml b/playbooks/common-tasks/ceph-server.yml index ded8665321..d699cbf994 100644 --- a/playbooks/common-tasks/ceph-server.yml +++ b/playbooks/common-tasks/ceph-server.yml @@ -36,42 +36,6 @@ when: - ansible_pkg_mgr in ['yum', 'dnf'] -- name: install the ceph stable repository key - rpm_key: - key: "{{ ceph_stable_key }}" - state: present - when: - - ceph_origin == 'repository' - - ceph_repository == 'community' - - ansible_pkg_mgr in ['yum', 'dnf'] - -- name: add ceph stable repository - package: - name: http://download.ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm - state: present - changed_when: false - when: - - ceph_origin == 'repository' - - ceph_repository == 'community' - - ansible_pkg_mgr in ['yum', 'dnf'] - -- name: Purge yum/dnf cache - command: "{{ ansible_pkg_mgr }} clean all" - when: - - ansible_pkg_mgr in ['yum', 'dnf'] - tags: - - skip_ansible_lint - -- name: Set default priority for Ceph repos - command: > - yum-config-manager - --enable Ceph - --setopt="Ceph.priority=99" - --enable Ceph-noarch - --setopt="Ceph-noarch.priority=99" - when: - - ansible_pkg_mgr in ['yum', 'dnf'] - # Set the priority of the ceph community apt repo either above or below that of UCA or distro sources - name: Set apt package pins include_role: