Juju Charms Collection
openstack-dashboard package

Merge lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next into lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Trusty Tahr (14.04)
next
Merge into next

Proposed by Shiv Prasad Rao on 2014-09-18

Status:	Merged
Merged at revision:	40
Proposed branch:	lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target:	205 lines (+62/-2) 8 files modified config.yaml (+3/-0) hooks/horizon_contexts.py (+11/-0) hooks/horizon_utils.py (+9/-0) templates/havana/local_settings.py (+7/-1) templates/icehouse/_40_router.py (+10/-0) templates/icehouse/local_settings.py (+6/-1) unit_tests/test_horizon_contexts.py (+14/-0) unit_tests/test_horizon_utils.py (+2/-0)
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
OpenStack Charmers	2014-09-18	Pending
Jorge Niedbalski	2014-09-18	Pending
Liam Young	2014-09-18	Pending
Review via email: mp+235181@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-08-21.

Description of the change

This merge proposal is prepared for supporting Cisco Nexus 1000V dashboard for its related extension tab/panel.
config.yaml
New parameter for supporting Cisco N1KV specific policy profile profile-support.

hooks/horizon_contexts.py
Context logic to retrieve profile

templates/havana/local_settings.py
For profile-support setting

Please refer to the old merge proposal for context:
https://code.launchpad.net/~springfield-team/charms/precise/openstack-dashboard/trunk/+merge/228471

Thanks,

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-08-26: Posted in a previous version of this proposal

Please run a 'make lint' and clean the reported errors.

hooks/horizon_contexts.py:87:80: E501 line too long (93 > 79 characters)
hooks/horizon_utils.py:43:80: E501 line too long (91 > 79 characters)
unit_tests/test_horizon_utils.py:48:80: E501 line too long (102 > 79 characters)

After getting this fixed, LGTM.

review: Needs Fixing

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-08-27: Posted in a previous version of this proposal

OK, thanks for fixing. LGTM +1

review: Approve

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-08-27: Posted in a previous version of this proposal

Subscribing openstack-charmers for review.

Revision history for this message

Liam Young (gnuoy) wrote on 2014-09-01: Posted in a previous version of this proposal

Looks good with a couple of small issues:

There seems to be a merge conflict with lp:~openstack-charmers/charms/trusty/openstack-dashboard/next atm.

I've also made a couple of minor inline comments

review: Needs Fixing

Revision history for this message

Shiv Prasad Rao (shivrao) wrote on 2014-09-03: Posted in a previous version of this proposal

I have synced with the latest. Also removed the charmhelper changes.
There are a couple of lint issues introduced introduced in the latest commit in the /next branch.

Revision history for this message

Edward Hope-Morley (hopem) wrote on 2014-09-18: Posted in a previous version of this proposal

@shivrao Please remember to "Resubmit Proposal" (see top right) after you submit changes in response to a "Needs Fixing" so that your merge proposal re-enters the review queue. Thanks