Merge lp:~taoliu-7/charms/trusty/contrail-analytics/node-manager into lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk

[Tony Liu]

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/contrail_analytics_hooks.py'
--- hooks/contrail_analytics_hooks.py	2015-07-21 19:09:14 +0000
+++ hooks/contrail_analytics_hooks.py	2015-09-23 18:39:18 +0000
@@ -34,10 +34,13 @@
     fix_services,
     write_analytics_api_config,
     write_collector_config,
-    write_query_engine_config
+    write_query_engine_config,
+    write_nodemgr_config,
+    install_nodemgr_config
 )
 
-PACKAGES = [ "contrail-analytics", "contrail-utils", "python-jinja2" ]
+PACKAGES = [ "contrail-analytics", "contrail-utils", "contrail-nodemgr",
+             "python-jinja2" ]
 
 hooks = Hooks()
 config = config()
@@ -74,11 +77,13 @@
 @hooks.hook("contrail-discovery-relation-broken")
 @restart_on_change({"/etc/contrail/contrail-collector.conf": ["contrail-collector"],
                     "/etc/contrail/contrail-query-engine.conf": ["contrail-query-engine"],
-                    "/etc/contrail/contrail-analytics-api.conf": ["contrail-analytics-api"]})
+                    "/etc/contrail/contrail-analytics-api.conf": ["contrail-analytics-api"],
+                    "/etc/contrail/contrail-analytics-nodemgr.conf": ["contrail-analytics-nodemgr"]})
 def contrail_discovery_relation():
     write_collector_config()
     write_query_engine_config()
     write_analytics_api_config()
+    write_nodemgr_config()
 
 @hooks.hook("http-services-relation-joined")
 def http_services_joined():
@@ -94,9 +99,10 @@
 @hooks.hook()
 def install():
     configure_installation_source(config["openstack-origin"])
-    configure_sources(True, "install-sources")
+    configure_sources(True, "install-sources", "install-keys")
     apt_upgrade(fatal=True, dist=True)
     apt_install(PACKAGES, fatal=True)
+    install_nodemgr_config()
     fix_permissions()
     fix_services()
 
@@ -111,9 +117,8 @@
     write_collector_config()
     write_query_engine_config()
     write_analytics_api_config()
-    for service in [ "contrail-collector", "contrail-query-engine",
-                     "contrail-analytics-api" ]:
-        service_restart(service)
+    write_nodemgr_config()
+    service_restart("supervisor-analytics")
 
 if __name__ == "__main__":
     main()
 
=== modified file 'hooks/contrail_analytics_utils.py'
--- hooks/contrail_analytics_utils.py	2015-07-23 20:44:36 +0000
+++ hooks/contrail_analytics_utils.py	2015-09-23 18:39:18 +0000
@@ -1,6 +1,9 @@
 import os
 from socket import gethostbyname
-from subprocess import check_output
+from subprocess import (
+    check_output,
+    check_call
+)
 
 from charmhelpers.core.hookenv import (
     related_units,
@@ -66,3 +69,26 @@
     ctx.update(discovery_ctx())
     render("contrail-query-engine.conf",
            "/etc/contrail/contrail-query-engine.conf", ctx)
+
+def install_nodemgr_config():
+    ctx = {}
+    render("contrail-nodemgr-analytics.ini",
+            "/etc/contrail/supervisord_analytics_files/contrail-nodemgr-analytics.ini",
+            ctx, "contrail", "contrail", 0644)
+    render("contrail-analytics-nodemgr",
+            "/etc/init.d/contrail-analytics-nodemgr",
+            ctx, "root", "root", 0755)
+    check_call(["supervisorctl",
+                "-s", "unix:///tmp/supervisord_analytics.sock",
+                "reread"])
+    check_call(["supervisorctl",
+                "-s", "unix:///tmp/supervisord_analytics.sock",
+                "add", "contrail-analytics-nodemgr"])
+
+def write_nodemgr_config():
+    ctx = {}
+    ctx.update(discovery_ctx())
+    render("contrail-analytics-nodemgr.conf",
+            "/etc/contrail/contrail-analytics-nodemgr.conf",
+            ctx, "contrail", "contrail", 0644)
+
 
=== added file 'templates/contrail-analytics-nodemgr'
--- templates/contrail-analytics-nodemgr	1970-01-01 00:00:00 +0000
+++ templates/contrail-analytics-nodemgr	2015-09-23 18:39:18 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# chkconfig: 2345 99 01
+# description: Juniper Network Analytics Node Manager
+
+supervisorctl -s unix:///tmp/supervisord_analytics.sock ${1} `basename ${0}`
+
 
=== added file 'templates/contrail-analytics-nodemgr.conf'
--- templates/contrail-analytics-nodemgr.conf	1970-01-01 00:00:00 +0000
+++ templates/contrail-analytics-nodemgr.conf	2015-09-23 18:39:18 +0000
@@ -0,0 +1,12 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+
+[DISCOVERY]
+server = {{ disc_server_ip }}
+port = 5998
+
+[COLLECTOR]
+#server_list = ip1:port1 ip2:port2
+
 
=== added file 'templates/contrail-nodemgr-analytics.ini'
--- templates/contrail-nodemgr-analytics.ini	1970-01-01 00:00:00 +0000
+++ templates/contrail-nodemgr-analytics.ini	2015-09-23 18:39:18 +0000
@@ -0,0 +1,12 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+
+[eventlistener:contrail-analytics-nodemgr]
+command=/bin/bash -c "exec /usr/bin/contrail-nodemgr"
+events=PROCESS_COMMUNICATION,PROCESS_STATE,TICK_60
+buffer_size=10000
+stdout_logfile=/var/log/contrail/contrail-analytics-nodemgr-stdout.log
+stderr_logfile=/var/log/contrail/contrail-analytics-nodemgr-stderr.log
+