← Back to branch summary

~joeborg/charms/trusty/contrail-configuration/rbac-switch

« back to all changes in this revision

Viewing changes to hooks/contrail_configuration_utils.py

  • Committer: Robert Ayres
  • Date: 2016-05-19 03:39:46 UTC
  • Revision ID: robert.ayres@canonical.com-20160519033946-m9w1ah91dtu7trrb
Support lbaasv2 plugin, fixes lp #1557835

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/contrail_configuration_utils.py
290
290
               "auth_port": relation_get("service_port", unit, rid),
291
291
               "admin_user": relation_get("service_username", unit, rid),
292
292
               "admin_password": relation_get("service_password", unit, rid),
293
 
               "admin_tenant_name": relation_get("service_tenant_name", unit, rid) }
 
293
               "admin_tenant_name": relation_get("service_tenant_name", unit, rid),
 
294
               "auth_region": relation_get("service_region", unit, rid) }
294
295
             for rid in relation_ids("identity-admin")
295
296
             for unit, hostname in
296
297
             ((unit, relation_get("service_hostname", unit, rid)) for unit in related_units(rid))
416
417
                "--admin_user", user,
417
418
                "--admin_password", password])
418
419
 
 
420
def write_barbican_auth_config():
 
421
    ctx = identity_admin_ctx()
 
422
    render("contrail-barbican-auth.conf",
 
423
           "/etc/contrail/contrail-barbican-auth.conf", ctx, "root", "contrail",
 
424
           0440)
 
425
 
419
426
def write_contrail_api_config():
420
427
    ctx = {}
421
428
    ctx.update(contrail_ctx())