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

[Dmitrii Shcherbakov]

rbac support (rebased)

[Robert Ayres (robert-ayres)]

Rejected - it seems from Contrail's own fab installer (3.2.3, Mitaka) 'cloud_admin_role' isn't read or required here.

Unmerged revisions

40. By Dmitrii Shcherbakov on 2017-03-14

add rbac relation data handling

The context is already pre-loaded with all relation data, therefore,
the only change required is in the template.

=== modified file 'templates/contrail-webui-userauth.js'
--- templates/contrail-webui-userauth.js	2016-11-14 20:48:45 +0000
+++ templates/contrail-webui-userauth.js	2017-03-17 09:26:06 +0000
@@ -7,6 +7,8 @@
 auth.admin_user = '{{ identity_admin[0]['service_username'] }}';
 auth.admin_password = '{{ identity_admin[0]['service_password'] }}';
 auth.admin_tenant_name = '{{ identity_admin[0]['service_tenant_name'] }}';
-
+{% if contrail_api[0].get('rbac') -%}
+auth.cloud_admin_role = '{{ contrail_api[0].get('cloud_admin_role') }}';
+{% endif -%}
 module.exports = auth;