ansible: Setup repos only in devel mode

We should not touch the repos in the production mode.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index 9b4c577329c6660ceeb1d2cb9250baeb06db3a35..f7fd64e221a0dcae0a7dc3d54829eca643d7f970 100644 (file)
--- 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 1da3184929cd1bf9eb8a037bdd302f06d88633f7..ba315fa6629dd01137cd9dcc67ed4409708699ab 100644 (file)
--- 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 6c59489c0aafa19d1f7f8801a2e1094febc34f40..3dbfc25f7635c2964c4183d82bca65488af0caed 100644 (file)
--- 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 11ba3d8f7a9e09f9d2773a7570f70387216f1db4..b7f0e2e9f68f365e3f11e6e9986e95cce7821d3b 100644 (file)
--- 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: