Improved placement of Analyst tasks in playbooks

- Updated cloudapex version grep

Change-Id: Ie0ec5aa181a53ac37b8d2cc4432ff5f6b735e839
Ticket: none
Signed-off-by: alij <alij@plumgrid.com>

Author: alij

plumgrid_playbooks/plumgrid_common.yml

@@ -42,6 +42,11 @@
   vars:
     pg_service_name: plumgrid-iovisor
 
+- hosts: shared-infra_hosts:compute_hosts:gateway_hosts
+  user: root
+  roles:
+    - plumgrid_utility
+
 - hosts: 127.0.0.1
   connection: local
   tasks:

plumgrid_playbooks/roles/plumgrid_cloudApex_check/tasks/main.yml

@@ -31,7 +31,7 @@
 
 - name: Check version of CloudApex
   shell: >
-    cat /var/lib/libvirt/filesystems/plumgrid/opt/pg/web/cloudApex/modules/appCloudApex/appCloudApex.js | grep -i appversion | awk '{print $2}'
+    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/dpkg -l | grep plumgrid-cloudapex | awk '{print $3}' | tr '-' ' ' | awk '{print $1}'
   when: ca_stats.stat.exists and (ca_stats.stat.isdir is defined and ca_stats.stat.isdir)
   register: ca_ver
 

plumgrid_playbooks/roles/plumgrid_common/tasks/main.yml

@@ -124,29 +124,3 @@
     src: "00-pg.conf"
     dest: "/var/lib/libvirt/filesystems/plumgrid-data/conf/etc/00-pg.conf"
   when: middleware_ip is defined
-
-# Stop Analyst service
-- name: Stop PLUMgrid Analyst service
-  shell: >
-    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/service plumgrid-sigmund stop
-  register: pg_sigmund_check
-  until: pg_sigmund_check.stdout.find('stop/waiting') != -1
-  ignore_errors: yes
-  retries: 3
-  delay: 5
-
-# Configure Analyst for OPSVM
-- name: Configure Analyst
-  shell: >
-    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/sigmund-configure --ip {{ middleware_ip }} --start --autoboot
-  ignore_errors: yes
-
-# Ensure Analyst service running
-- name: Ensure PLUMgrid Analyst service
-  shell: >
-    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/service plumgrid-sigmund status
-  register: pg_sigmund_check
-  until: pg_sigmund_check.stdout.find('start/running') != -1
-  ignore_errors: yes
-  retries: 3
-  delay: 5

plumgrid_playbooks/roles/plumgrid_utility/tasks/main.yml

@@ -0,0 +1,38 @@
+---
+#
+# Copyright (c) 2016, PLUMgrid Inc, http://plumgrid.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Stop PLUMgrid Analyst service
+  shell: >
+    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/service plumgrid-sigmund stop
+  register: pg_sigmund_check
+  until: pg_sigmund_check.stdout.find('stop/waiting') != -1
+  ignore_errors: yes
+  retries: 3
+  delay: 5
+
+- name: Configure Analyst
+  shell: >
+    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/sigmund-configure --ip {{ middleware_ip }} --start --autoboot
+  ignore_errors: yes
+
+- name: Ensure PLUMgrid Analyst service
+  shell: >
+    /opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p /usr/bin/service plumgrid-sigmund status
+  register: pg_sigmund_check
+  until: pg_sigmund_check.stdout.find('start/running') != -1
+  ignore_errors: yes
+  retries: 3
+  delay: 5