From: Zack Cerza Date: Thu, 31 Mar 2016 16:14:07 +0000 (-0600) Subject: Support Fedora as a collector X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2a2b0831523de7baa1ff843be61eb14ae59484a9;p=ceph-cm-ansible.git Support Fedora as a collector Signed-off-by: Zack Cerza --- diff --git a/roles/pcp/README.rst b/roles/pcp/README.rst index fe29520..b2b4f8c 100644 --- 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 4b47aa5..f5e9704 100644 --- 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 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