Merge lp:~ivoks/charms/trusty/contrail-analytics/cassandra-authentication into lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk

[Ante Karamatić]

Currently Contrail charms require cassandra to run in unrestricted mode, allowing every user access to all of the data. With this change analytics can use password authentication in Cassandra.

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/contrail_analytics_utils.py'
--- hooks/contrail_analytics_utils.py	2017-03-10 13:02:06 +0000
+++ hooks/contrail_analytics_utils.py	2017-03-21 10:07:54 +0000
@@ -100,9 +100,18 @@
                 ((unit, relation_get("host", unit, rid),
                   relation_get(key, unit, rid))
                  for unit in related_units(rid))
-                if port ] \
-              if config.get("cassandra-ready") else []
-    return { "cassandra_servers": servers }
+                if port ]
+    ctxs = [ { "cassandra_servers": servers,
+               "cassandra_username": username,
+               "cassandra_password": password,
+             }
+            for rid in relation_ids("cassandra")
+            for unit, username, password in
+            ((unit,
+              relation_get("username", unit, rid),
+              relation_get("password", unit, rid))
+             for unit in related_units(rid))]
+    return ctxs[0] if ctxs else {}
 
 def cassandra_units():
     """Return a list of cassandra units"""

=== modified file 'templates/contrail-analytics-api.conf'
--- templates/contrail-analytics-api.conf	2017-01-31 12:44:08 +0000
+++ templates/contrail-analytics-api.conf	2017-03-21 10:07:54 +0000
@@ -17,6 +17,10 @@
 api_server = {{ api_server ~ ":" ~ api_port if api_server and api_port }}
 {%- endif %}
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}
+
 [DISCOVERY]
 disc_server_ip = {{ disc_server_ip }}
 disc_server_port = {{ disc_server_port }}

=== modified file 'templates/contrail-collector.conf'
--- templates/contrail-collector.conf	2017-01-31 12:44:08 +0000
+++ templates/contrail-collector.conf	2017-03-21 10:07:54 +0000
@@ -17,6 +17,10 @@
 syslog_port = 514
 sflow_port = 6343
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}
+
 [COLLECTOR]
 port = 8086
 server = 0.0.0.0

=== modified file 'templates/contrail-query-engine.conf'
--- templates/contrail-query-engine.conf	2015-06-11 22:02:41 +0000
+++ templates/contrail-query-engine.conf	2017-03-21 10:07:54 +0000
@@ -14,6 +14,10 @@
 max_slice = 100
 max_tasks = 16
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}
+
 [DISCOVERY]
 port = {{ disc_server_port }}
 server = {{ disc_server_ip }}