Merge lp:~dmitriis/charms/trusty/contrail-analytics/trunk into lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk

[Dmitrii Shcherbakov]

rbac support (rebased)

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/contrail_analytics_hooks.py'
--- hooks/contrail_analytics_hooks.py	2017-03-10 13:02:06 +0000
+++ hooks/contrail_analytics_hooks.py	2017-03-17 09:27:51 +0000
@@ -160,7 +160,13 @@
 
 @hooks.hook("contrail-api-relation-changed")
 def contrail_api_changed():
-    if not relation_get("port"):
+    required_keys = ['port']
+    # only need to check for role availability if
+    # rbac is explicitly set
+    if relation_get('rbac'):
+        required_keys.append('cloud-admin-role')
+
+    if not all(relation_get(k) for k in required_keys):
         log("Relation not ready")
         return
     contrail_api_relation()

=== 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-17 09:27:51 +0000
@@ -113,10 +113,17 @@
 def contrail_api_ctx():
     ctxs = [ { "api_server": vip if vip \
                  else gethostbyname(relation_get("private-address", unit, rid)),
-               "api_port": port }
+               "api_port": port,
+               "rbac": rbac,
+               "cloud_admin_role": adminrole
+              }
              for rid in relation_ids("contrail-api")
-             for unit, port, vip in
-             ((unit, relation_get("port", unit, rid), relation_get("vip", unit, rid))
+             for unit, port, vip, rbac, adminrole in
+             ((unit,
+               relation_get("port", unit, rid),
+               relation_get("vip", unit, rid),
+               relation_get("rbac", unit, rid),
+               relation_get("cloud-admin-role", unit, rid))
               for unit in related_units(rid))
              if port ]
     return ctxs[0] if ctxs else {}

=== 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-17 09:27:51 +0000
@@ -17,6 +17,12 @@
 api_server = {{ api_server ~ ":" ~ api_port if api_server and api_port }}
 {%- endif %}
 
+{% if rbac -%}
+aaa_mode = no-auth
+cloud_admin_role = {{ cloud_admin_role }}
+
+{% endif %}
+
 [DISCOVERY]
 disc_server_ip = {{ disc_server_ip }}
 disc_server_port = {{ disc_server_port }}