Install cephmetrics repo in production mode

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/README.md b/README.md
index 0be97753c3d78259d895123118db7e22e7044afb..efe3413308676e3eb6bbfda3c56b07b397d57894 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,11 +32,6 @@ curl -L -o /etc/yum.repos.d/cephmetrics.repo http://download.ceph.com/cephmetric
 yum install cephmetrics-ansible
 ```
 
-The cephmetrics repo also needs to be installed on all the ceph nodes as well.  Run the following on each ceph host:
-```
-sudo curl -L -o /etc/yum.repos.d/cephmetrics.repo http://download.ceph.com/cephmetrics/rpm-master/el7/cephmetrics.repo
-```
-
 ### Create or edit the inventory file
 
 Next, we need an inventory file.  If you are running `ansible-playbook` on a host that previously ran `ceph-ansible`, you may simply modify `/etc/ansible/hosts`; otherwise you may copy `/usr/share/cephmetrics-ansible/inventory.sample` and modify it if you wish.

diff --git a/ansible/common/files/cephmetrics-devel.repo b/ansible/common/files/cephmetrics-devel.repo
new file mode 100644 (file)
index 0000000..48d8733
--- /dev/null
+++ b/ansible/common/files/cephmetrics-devel.repo
@@ -0,0 +1,20 @@
+[cephmetrics]
+name=cephmetrics packages for \$basearch
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/\$basearch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-noarch]
+name=cephmetrics noarch packages
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/noarch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-source]
+name=cephmetrics source packages
+baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/SRPMS
+enabled=1
+gpgcheck=0
+type=rpm-md

diff --git a/ansible/common/files/cephmetrics-prod.repo b/ansible/common/files/cephmetrics-prod.repo
new file mode 100644 (file)
index 0000000..990a5bc
--- /dev/null
+++ b/ansible/common/files/cephmetrics-prod.repo
@@ -0,0 +1,20 @@
+[cephmetrics]
+name=cephmetrics packages for \$basearch
+baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/\$basearch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-noarch]
+name=cephmetrics noarch packages
+baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/noarch
+enabled=1
+gpgcheck=0
+type=rpm-md
+
+[cephmetrics-source]
+name=cephmetrics source packages
+baseurl=http://download.ceph.com/cephmetrics/rpm-master/el7/SRPMS
+enabled=0
+gpgcheck=0
+type=rpm-md

diff --git a/ansible/common/files/cephmetrics.repo b/ansible/common/files/cephmetrics.repo
deleted file mode 100644 (file)
index 48d8733..0000000
--- a/ansible/common/files/cephmetrics.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-[cephmetrics]
-name=cephmetrics packages for \$basearch
-baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/\$basearch
-enabled=1
-gpgcheck=0
-type=rpm-md
-
-[cephmetrics-noarch]
-name=cephmetrics noarch packages
-baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/noarch
-enabled=1
-gpgcheck=0
-type=rpm-md
-
-[cephmetrics-source]
-name=cephmetrics source packages
-baseurl=https://chacra.ceph.com/r/cephmetrics/master/HEAD/rhel/7/flavors/default/SRPMS
-enabled=1
-gpgcheck=0
-type=rpm-md

diff --git a/ansible/roles/ceph-collectd/files/cephmetrics-devel.repo b/ansible/roles/ceph-collectd/files/cephmetrics-devel.repo
new file mode 120000 (symlink)
index 0000000..0b366fa
--- /dev/null
+++ b/ansible/roles/ceph-collectd/files/cephmetrics-devel.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics-devel.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-collectd/files/cephmetrics-prod.repo b/ansible/roles/ceph-collectd/files/cephmetrics-prod.repo
new file mode 120000 (symlink)
index 0000000..9014d73
--- /dev/null
+++ b/ansible/roles/ceph-collectd/files/cephmetrics-prod.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics-prod.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-collectd/files/cephmetrics.repo b/ansible/roles/ceph-collectd/files/cephmetrics.repo
deleted file mode 120000 (symlink)
index 2dec932..0000000
--- a/ansible/roles/ceph-collectd/files/cephmetrics.repo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/files/cephmetrics.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-collectd/tasks/main.yml b/ansible/roles/ceph-collectd/tasks/main.yml
index 6370516c35b2d77e289d9e69bc3d4cc30787f247..91741ed2711bd21d6ffab8321e5bba5397cdf32e 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/main.yml
+++ b/ansible/roles/ceph-collectd/tasks/main.yml
@@ -2,9 +2,9 @@
 - include: setup_repos.yml
   when:
     - not containerized_deployment
-    - devel_mode
   tags:
     - packages
+    - repos
 
 - include: install_packages.yml
   when: not containerized_deployment

diff --git a/ansible/roles/ceph-collectd/tasks/setup_repos.yml b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
index ba315fa6629dd01137cd9dcc67ed4409708699ab..48f9ce03eeb00650d4b0badf2e5ae20c47cb67fa 100644 (file)
--- a/ansible/roles/ceph-collectd/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-collectd/tasks/setup_repos.yml
@@ -5,15 +5,29 @@
     state: "{{ 'present' if use_epel else 'absent' }}"
   when:
     - ansible_pkg_mgr == "yum"
+    - devel_mode
 
-- name: Install chacra repo
+- name: Install cephmetrics development repo
   copy:
-    src: cephmetrics.repo
+    src: cephmetrics-devel.repo
     dest: /etc/yum.repos.d/cephmetrics.repo
-  when: ansible_pkg_mgr == "yum"
+  when:
+    - ansible_pkg_mgr == "yum"
+    - devel_mode
 
-- name: Remove chacra repo
+- name: Remove cephmetrics development repo
   file:
     path: /etc/yum.repos.d/cephmetrics.repo
     state: absent
-  when: ansible_pkg_mgr == "yum" and use_epel
+  when:
+    - ansible_pkg_mgr == "yum"
+    - use_epel
+    - devel_mode
+
+- name: Install cephmetrics production repo
+  copy:
+    src: files/cephmetrics-prod.repo
+    dest: /etc/yum.repos.d/cephmetrics.repo
+  when:
+    - ansible_pkg_mgr == "yum"
+    - not devel_mode

diff --git a/ansible/roles/ceph-grafana/files/cephmetrics-devel.repo b/ansible/roles/ceph-grafana/files/cephmetrics-devel.repo
new file mode 120000 (symlink)
index 0000000..0b366fa
--- /dev/null
+++ b/ansible/roles/ceph-grafana/files/cephmetrics-devel.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics-devel.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-grafana/files/cephmetrics-prod.repo b/ansible/roles/ceph-grafana/files/cephmetrics-prod.repo
new file mode 120000 (symlink)
index 0000000..9014d73
--- /dev/null
+++ b/ansible/roles/ceph-grafana/files/cephmetrics-prod.repo
@@ -0,0 +1 @@
+../../../common/files/cephmetrics-prod.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-grafana/files/cephmetrics.repo b/ansible/roles/ceph-grafana/files/cephmetrics.repo
deleted file mode 120000 (symlink)
index 2dec932..0000000
--- a/ansible/roles/ceph-grafana/files/cephmetrics.repo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/files/cephmetrics.repo
\ No newline at end of file

diff --git a/ansible/roles/ceph-grafana/tasks/main.yml b/ansible/roles/ceph-grafana/tasks/main.yml
index 3dbfc25f7635c2964c4183d82bca65488af0caed..11ab0617e5b75c1a3a0e12bbe0b67570b4433a10 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/main.yml
+++ b/ansible/roles/ceph-grafana/tasks/main.yml
@@ -2,9 +2,9 @@
 - include: setup_repos.yml
   when:
     - not containerized_deployment
-    - devel_mode
   tags:
     - packages
+    - repos
 
 - include: install_packages.yml
   when: not containerized_deployment

diff --git a/ansible/roles/ceph-grafana/tasks/setup_repos.yml b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
index b7f0e2e9f68f365e3f11e6e9986e95cce7821d3b..92501adf33950f501afa769fa1445f3afdeca245 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_repos.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_repos.yml
@@ -5,22 +5,25 @@
     state: "{{ 'present' if use_epel else 'absent' }}"
   when:
     - ansible_pkg_mgr == "yum"
+    - devel_mode
 
-- name: Install chacra repo
+- name: Install cephmetrics development repo
   copy:
-    src: files/cephmetrics.repo
+    src: files/cephmetrics-devel.repo
     dest: /etc/yum.repos.d/cephmetrics.repo
   when:
     - ansible_pkg_mgr == "yum"
     - not use_epel
+    - devel_mode
 
-- name: Remove chacra repo
+- name: Remove cephmetrics repo
   file:
     path: /etc/yum.repos.d/cephmetrics.repo
     state: absent
   when:
     - ansible_pkg_mgr == "yum"
     - use_epel
+    - devel_mode
 
 - name: Add Grafana repo
   template:
@@ -29,6 +32,7 @@
   when:
     - ansible_pkg_mgr == 'yum'
     - use_epel
+    - devel_mode
 
 - name: Remove Grafana repo
   file:
@@ -37,3 +41,12 @@
   when:
     - ansible_pkg_mgr == "yum"
     - not use_epel
+    - devel_mode
+
+- name: Install cephmetrics production repo
+  copy:
+    src: files/cephmetrics-prod.repo
+    dest: /etc/yum.repos.d/cephmetrics.repo
+  when:
+    - ansible_pkg_mgr == "yum"
+    - not devel_mode