Merge lp:~junaidali/charms/trusty/plumgrid-edge/analyst_opsvm into lp:~plumgrid-team/charms/trusty/plumgrid-edge/trunk

[Junaid Ali]

[Javeria Khan (javeria-ak)]

review: Approve

[lp:~junaidali/charms/trusty/plumgrid-edge/analyst_opsvm]

33. By Junaid Ali on 2016-08-05

Restarting analyst only on opsvm ip change

[Bilal Baqar (bbaqar)]

review: Approve

[lp:~junaidali/charms/trusty/plumgrid-edge/analyst_opsvm]

34. By Junaid Ali on 2016-08-05

Updated ns_enter as constant

Unmerged revisions

34. By Junaid Ali on 2016-08-05

Updated ns_enter as constant

33. By Junaid Ali on 2016-08-05

Restarting analyst only on opsvm ip change

32. By Junaid Ali on 2016-07-29

Changes:
   - Configure Analyst for OPSVM [SOL-1144]

=== modified file 'hooks/pg_edge_utils.py'
--- hooks/pg_edge_utils.py	2016-07-25 17:00:24 +0000
+++ hooks/pg_edge_utils.py	2016-08-05 17:30:43 +0000
@@ -100,6 +100,31 @@
         log('Unable to update /etc/apt/sources.list')
 
 
+def configure_analyst_opsvm(opsvm_ip):
+    '''
+    Configures Anaylyst for OPSVM
+    '''
+    if not service_running('plumgrid'):
+        restart_pg()
+    NS_ENTER = ('/opt/local/bin/nsenter -t $(ps ho pid --ppid '
+                '$(cat /var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p ')
+    sigmund_stop = NS_ENTER + '/usr/bin/service plumgrid-sigmund stop'
+    sigmund_status = NS_ENTER \
+        + '/usr/bin/service plumgrid-sigmund status'
+    sigmund_autoboot = NS_ENTER \
+        + '/usr/bin/sigmund-configure --ip {0} --start --autoboot' \
+        .format(opsvm_ip)
+    try:
+        status = subprocess.check_output(sigmund_status, shell=True)
+        if 'start/running' in status:
+            if subprocess.call(sigmund_stop, shell=True):
+                log('plumgrid-sigmund couldn\'t be stopped!')
+                return
+        subprocess.check_call(sigmund_autoboot, shell=True)
+    except:
+        log('plumgrid-sigmund couldn\'t be started!')
+
+
 def determine_packages():
     '''
     Returns list of packages required by PLUMgrid Edge as specified
@@ -449,6 +474,10 @@
             f(*args, **kwargs)
             for path in restart_map:
                 if path_hash(path) != checksums[path]:
+                    if path == OPS_CONF:
+                        from pg_edge_context import _pg_dir_context
+                        opsvm_ip = _pg_dir_context()['opsvm_ip']
+                        configure_analyst_opsvm(opsvm_ip)
                     restart_pg()
                     break
         return wrapped_f