Support Fedora as a collector

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

diff --git a/roles/pcp/README.rst b/roles/pcp/README.rst
index fe2952056410abce4174c8fc4a8d60d1987e6ade..b2b4f8c85ddf4785aa57c9b7786e362562b0ff35 100644 (file)
--- a/roles/pcp/README.rst
+++ b/roles/pcp/README.rst
@@ -2,11 +2,15 @@ PCP
 ===
 This role is used to configure a node to run PCP_.
 
-It has been tested on:
+These distros should be fully supported:
 
 - CentOS 7
 - Ubuntu 14.04 (Trusty)
 
+These distros are supported as ``pcp_collector`` nodes:
+
+- Fedora 22 (Only via ansible 2)
+
 .. _PCP: https://github.com/performancecopilot/pcp
 
 Variables

diff --git a/roles/pcp/tasks/collector.yml b/roles/pcp/tasks/collector.yml
index 4b47aa5d4a3ec59b83efdf901ff49095a08c61f9..f5e9704355546e7c7586c345f8d7bca4def3c96e 100644 (file)
--- a/roles/pcp/tasks/collector.yml
+++ b/roles/pcp/tasks/collector.yml
@@ -15,6 +15,14 @@
   when:
     ansible_pkg_mgr == "yum"
 
+- name: Install pcp
+  dnf:
+    name: "{{ pcp_package }}"
+    state: latest
+  register: install_pcp_dnf
+  when:
+    ansible_pkg_mgr == "dnf"
+
 - name: Restart pcp
   service:
     name: "{{ pmcd_service }}"
@@ -22,7 +30,8 @@
     enabled: yes
   when:
     install_pcp_apt|changed or
-    install_pcp_yum|changed
+    install_pcp_yum|changed or
+    install_pcp_dnf|changed
 
 - name: Restart pmlogger
   service:
@@ -31,4 +40,5 @@
     enabled: yes
   when:
     install_pcp_apt|changed or
-    install_pcp_yum|changed
+    install_pcp_yum|changed or
+    install_pcp_dnf|changed

diff --git a/roles/pcp/vars/dnf_systems.yml b/roles/pcp/vars/dnf_systems.yml
new file mode 100644 (file)
index 0000000..b47ba6f
--- /dev/null
+++ b/roles/pcp/vars/dnf_systems.yml
@@ -0,0 +1,11 @@
+---
+pcp_user: pcp
+pcp_package: pcp
+pmcd_service: pmcd
+pmlogger_service: pmlogger
+pcp_manager_package: pcp-manager
+pmmgr_service: pmmgr
+avahi_package: avahi
+pcp_webapi_package: pcp-webapi
+pcp_webjs_package: pcp-webjs
+pmwebd_service: pmwebd