From: Zack Cerza Date: Thu, 21 Apr 2016 16:16:53 +0000 (-0600) Subject: Enable pcp-webapi on Ubuntu with upstream packages X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e4921d101e52c77a236a1cceefaac47383287e6b;p=ceph-cm-ansible.git Enable pcp-webapi on Ubuntu with upstream packages Signed-off-by: Zack Cerza --- diff --git a/roles/pcp/tasks/web.yml b/roles/pcp/tasks/web.yml index abcfca2..374fbb2 100644 --- a/roles/pcp/tasks/web.yml +++ b/roles/pcp/tasks/web.yml @@ -1,8 +1,8 @@ --- - name: Fail when on Ubuntu fail: - msg: "pcp-web isn't available on Ubuntu yet :(" - when: ansible_distribution == "Ubuntu" + msg: "pcp-webapi is only available when using upstream packages. Set upstream_repo to true." + when: ansible_distribution == "Ubuntu" and upstream_repo|bool != true - name: Install pcp-webapi yum: @@ -18,6 +18,13 @@ register: install_pcp_webjs when: ansible_pkg_mgr == "yum" +- name: Install pcp-webapi + apt: + name: "{{ pcp_webapi_package }}" + state: latest + register: install_pcp_webapi + when: ansible_pkg_mgr == "apt" + - name: Enable pmwebd service: name: "{{ pmwebd_service }}" diff --git a/roles/pcp/vars/apt_systems.yml b/roles/pcp/vars/apt_systems.yml index d4789c4..7012c9b 100644 --- a/roles/pcp/vars/apt_systems.yml +++ b/roles/pcp/vars/apt_systems.yml @@ -7,3 +7,5 @@ pmlogger_service: pmlogger pcp_manager_package: pcp pmmgr_service: pmmgr avahi_package: avahi-daemon +pcp_webapi_package: pcp-webapi +pmwebd_service: pmwebd