Merge lp:~ivoks/charms/trusty/contrail-configuration/cassandra-authentication into lp:~sdn-charmers/charms/trusty/contrail-configuration/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 configuration can use password authentication in Cassandra.

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/contrail_configuration_utils.py'
--- hooks/contrail_configuration_utils.py	2017-03-10 12:49:07 +0000
+++ hooks/contrail_configuration_utils.py	2017-03-21 10:08:54 +0000
@@ -136,9 +136,19 @@
                   relation_get("rpc_port", unit, rid),
                   relation_get("port", unit, rid))
                  for unit in related_units(rid))
-                if rpc_port or port ] \
-              if config.get("cassandra-ready") else []
-    return { "cassandra_servers": servers }
+                if rpc_port or 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-api.conf'
--- templates/contrail-api.conf	2017-01-31 12:51:09 +0000
+++ templates/contrail-api.conf	2017-03-21 10:08:54 +0000
@@ -28,3 +28,6 @@
 admin_token = 
 admin_tenant_name = {{ admin_tenant_name }}
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}

=== modified file 'templates/contrail-device-manager.conf'
--- templates/contrail-device-manager.conf	2016-04-23 02:01:49 +0000
+++ templates/contrail-device-manager.conf	2017-03-21 10:08:54 +0000
@@ -23,3 +23,6 @@
 admin_password = {{ admin_password }}
 admin_tenant_name = {{ admin_tenant_name }}
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}

=== modified file 'templates/contrail-schema.conf'
--- templates/contrail-schema.conf	2016-04-19 21:10:36 +0000
+++ templates/contrail-schema.conf	2017-03-21 10:08:54 +0000
@@ -22,3 +22,6 @@
 admin_password = {{ admin_password }}
 admin_tenant_name = {{ admin_tenant_name }}
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}

=== modified file 'templates/contrail-svc-monitor.conf'
--- templates/contrail-svc-monitor.conf	2016-04-19 21:10:36 +0000
+++ templates/contrail-svc-monitor.conf	2017-03-21 10:08:54 +0000
@@ -33,3 +33,6 @@
 analytics_server_ip = {{ analytics_server_ip }}
 analytics_server_port = {{ analytics_server_port }}
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}

=== modified file 'templates/discovery.conf'
--- templates/discovery.conf	2015-06-01 19:32:33 +0000
+++ templates/discovery.conf	2017-03-21 10:08:54 +0000
@@ -16,3 +16,6 @@
 hc_max_miss = 3
 ttl_short = 1
 
+[CASSANDRA]
+cassandra_user = {{ cassandra_username }}
+cassandra_password = {{ cassandra_password }}