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

[Junaid Ali]

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

37. By Junaid Ali on 2016-07-28

Fix for sigmund-configure path [SOL-1144]

38. By Junaid Ali on 2016-07-29

checking the plumgrid service before
configuring OPSVM analyst

[Javeria Khan (javeria-ak)]

review: Approve

[Bilal Baqar (bbaqar)]

review: Approve

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

39. By Junaid Ali on 2016-08-05

Updated ns_enter as constant

Unmerged revisions

39. By Junaid Ali on 2016-08-05

Updated ns_enter as constant

38. By Junaid Ali on 2016-07-29

checking the plumgrid service before
configuring OPSVM analyst

37. By Junaid Ali on 2016-07-28

Fix for sigmund-configure path [SOL-1144]

36. By Junaid Ali on 2016-07-28

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

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-07-28 17:25:54 +0000
+++ hooks/pg_dir_hooks.py	2016-08-05 17:43:28 +0000
@@ -41,7 +41,8 @@
     load_iptables,
     restart_on_change,
     director_cluster_ready,
-    configure_pg_sources
+    configure_pg_sources,
+    configure_analyst_opsvm
 )
 
 hooks = Hooks()
@@ -159,6 +160,7 @@
     '''
     This hook is run when the charm is started.
     '''
+    configure_analyst_opsvm()
     if config('plumgrid-license-key') is not None:
         count = 0
         while (count < 10):

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-07-27 19:37:26 +0000
+++ hooks/pg_dir_utils.py	2016-08-05 17:43:28 +0000
@@ -103,6 +103,31 @@
         log('Unable to update /etc/apt/sources.list')
 
 
+def configure_analyst_opsvm():
+    '''
+    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(config('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 director as specified

=== modified file 'unit_tests/test_pg_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2016-05-01 02:16:59 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-08-05 17:43:28 +0000
@@ -32,7 +32,8 @@
     'post_pg_license',
     'config',
     'load_iptables',
-    'status_set'
+    'status_set',
+    'configure_analyst_opsvm'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"