Enable pcp-webapi on Ubuntu with upstream packages

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

diff --git a/roles/pcp/tasks/web.yml b/roles/pcp/tasks/web.yml
index abcfca24f6e49e5c7ad781a9243536b318de5e64..374fbb2e139fd15af049a0948157147df553d9cb 100644 (file)
--- 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 d4789c474553b3cc50651b7f42817e8683e885d5..7012c9bc950ec8264799fc392adaca051a20762e 100644 (file)
--- 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