Juju Charms Collection
openstack-dashboard package

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

Proposed by James Page on 2014-07-28

Status:	Merged
Merged at revision:	40
Proposed branch:	lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target:	158 lines (+54/-4) (has conflicts) 7 files modified config.yaml (+6/-0) hooks/charmhelpers/contrib/openstack/utils.py (+2/-2) hooks/horizon_contexts.py (+14/-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) Text conflict in config.yaml Text conflict in hooks/horizon_contexts.py
To merge this branch:	bzr merge lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
James Page		Needs Fixing on 2014-07-28
Marco Ceppi	2014-07-28	Pending
Shiv Prasad Rao	2014-07-28	Pending
Review via email: mp+228471@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-05-02.

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-support

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

Revision history for this message

Marco Ceppi (marcoceppi) wrote on 2014-04-30: Posted in a previous version of this proposal

Leaving for openstack-charmers, thanks!!

review: Abstain

Revision history for this message

ChingWei Chang (cwchang) wrote on 2014-05-02: Posted in a previous version of this proposal

We have merged with latest Icehouse merge to charm store now.
Please re-review this version

Revision history for this message

James Page (james-page) wrote on 2014-05-21: Posted in a previous version of this proposal

Thanks for this proposal.

I think you need to tweak the way that the profile_support is handled. Specifically

1) config.yaml

Don't provide a default on "None" - the default is null which translates into None in python once parsed.

Also lets drop "-support" from the configuration key - its really just the profile.

Some comments in the description as to which values work would be nice as well.

2) local_settings.py

Rather than dropping the value directly into local settings, I'd prefer to see a conditional code block in the template that sets the profile_support value if its not None, and defaults the the original code if its None.

3) hooks/horizon_contexts.py

Please validate that the profile-support config is a supported value - 'cisco' or None should be right I think.

Thanks!

review: Needs Fixing

Revision history for this message

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

Addressed the comments:

1) changed the config parameter to "profile" in config.yaml. It was originally created as profile-support because the parameter in the local_setting is profile-support.

2) Added conditional code block in local_settings.py

3) added validation for supported value. Currently it is only cisco.

review: Needs Resubmitting

Revision history for this message

James Page (james-page) wrote on 2014-07-28:

Hi Folks

I've re-targetted this proposal at the next branch inline with:

https://wiki.ubuntu.com/ServerTeam/OpenStackCharms

Some rebasing required; you'll also need to update the unit tests in unit_tests to deal with the proposed changes.

Thanks!

review: Needs Fixing

lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk updated on 2014-08-01