From 9186466688fef4337cb26314f6d16f8090a0e567 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 23 Jun 2017 09:09:57 +0200 Subject: [PATCH] ansible: Setup repos only in devel mode We should not touch the repos in the production mode. Signed-off-by: Boris Ranto --- ansible/roles/ceph-collectd/tasks/main.yml | 4 +++- ansible/roles/ceph-collectd/tasks/setup_repos.yml | 1 - ansible/roles/ceph-grafana/tasks/main.yml | 4 +++- ansible/roles/ceph-grafana/tasks/setup_repos.yml | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml index 9b4c577..f7fd64e 100644 --- a/ansible/roles/ceph-collectd/tasks/main.yml +++ b/ansible/roles/ceph-collectd/tasks/main.yml @@ -1,6 +1,8 @@ --- - include: setup_repos.yml - when: not containerized_deployment + when: + - not containerized_deployment + - devel_mode tags: - packages diff --git a/ansible/roles/ceph-collectd/tasks/setup_repos.yml b/ansible/roles/ceph-collectd/tasks/setup_repos.yml index 1da3184..ba315fa 100644 --- a/ansible/roles/ceph-collectd/tasks/setup_repos.yml +++ b/ansible/roles/ceph-collectd/tasks/setup_repos.yml @@ -4,7 +4,6 @@ name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm" state: "{{ 'present' if use_epel else 'absent' }}" when: - - devel_mode - ansible_pkg_mgr == "yum" - name: Install chacra repo diff --git a/ansible/roles/ceph-grafana/tasks/main.yml b/ansible/roles/ceph-grafana/tasks/main.yml index 6c59489..3dbfc25 100644 --- a/ansible/roles/ceph-grafana/tasks/main.yml +++ b/ansible/roles/ceph-grafana/tasks/main.yml @@ -1,6 +1,8 @@ --- - include: setup_repos.yml - when: not containerized_deployment + when: + - not containerized_deployment + - devel_mode tags: - packages diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml index 11ba3d8..b7f0e2e 100644 --- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml +++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml @@ -5,7 +5,6 @@ state: "{{ 'present' if use_epel else 'absent' }}" when: - ansible_pkg_mgr == "yum" - - devel_mode - name: Install chacra repo copy: @@ -30,7 +29,6 @@ when: - ansible_pkg_mgr == 'yum' - use_epel - - devel_mode - name: Remove Grafana repo file: -- 2.47.3