Merge lp://staging/~dmitriis/charms/trusty/neutron-api-contrail/trunk into lp://staging/~sdn-charmers/charms/trusty/neutron-api-contrail/trunk

Proposed by Dmitrii Shcherbakov
Status: Merged
Merged at revision: 16
Proposed branch: lp://staging/~dmitriis/charms/trusty/neutron-api-contrail/trunk
Merge into: lp://staging/~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
Diff against target: 238 lines (+104/-31)
3 files modified
hooks/neutron_api_contrail_hooks.py (+86/-25)
hooks/neutron_api_contrail_utils.py (+12/-5)
templates/ContrailPlugin.ini (+6/-1)
To merge this branch: bzr merge lp://staging/~dmitriis/charms/trusty/neutron-api-contrail/trunk
Reviewer Review Type Date Requested Status
Robert Ayres (community) Approve
Ante Karamatić Pending
Review via email: mp+320153@code.staging.launchpad.net

Description of the change

rbac support (rebased)

To post a comment you must log in.
Revision history for this message
Bernhard Koessler (bkoessler) wrote :

you would also need to add the following to /etc/neutron/api-paste.ini:

[composite:neutronapi_v2_0]
keystone = user_token …

[filter:user_token] paste.filter_factory = neutron_plugin_contrail.plugins.opencontrail.neutron_middleware:token_factory

Revision history for this message
Dmitrii Shcherbakov (dmitriis) wrote :

This is done in the neutron-api charm.

https://review.openstack.org/#/c/439270/

Best Regards,
Dmitrii Shcherbakov

*Dmitrii Shcherbakov * | *Canonical*
Field Software Engineer
<email address hidden>
IRC (freenode): Dmitrii-Sh

On Mon, Mar 27, 2017 at 12:57 PM, Bernhard Koessler <email address hidden>
wrote:

> you would also need to add the following to /etc/neutron/api-paste.ini:
>
> [composite:neutronapi_v2_0]
> keystone = user_token …
>
> [filter:user_token] paste.filter_factory = neutron_plugin_contrail.
> plugins.opencontrail.neutron_middleware:token_factory
>
> --
> https://code.launchpad.net/~dmitriis/charms/trusty/
> neutron-api-contrail/trunk/+merge/320153
> You are the owner of lp:~dmitriis/charms/trusty/
> neutron-api-contrail/trunk.
>

Revision history for this message
Robert Ayres (robert-ayres) wrote :

For this to get merged, please remove all the unnecessary formatting changes.

This diff should only contain the *actual* code changes.

Revision history for this message
Robert Ayres (robert-ayres) wrote :

Looks like r16 is PEP8 changes and r17 the RBAC changes.

To save effort, we can just look at merging r17 here.

Revision history for this message
Robert Ayres (robert-ayres) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches