Merge lp://qastaging/~billy-olsen/charm-helpers/better-address-endpoint-overrides into lp://qastaging/charm-helpers

Proposed by Billy Olsen
Status: Merged
Merged at revision: 383
Proposed branch: lp://qastaging/~billy-olsen/charm-helpers/better-address-endpoint-overrides
Merge into: lp://qastaging/charm-helpers
Diff against target: 224 lines (+75/-73)
2 files modified
charmhelpers/contrib/openstack/ip.py (+49/-44)
tests/contrib/openstack/test_ip.py (+26/-29)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charm-helpers/better-address-endpoint-overrides
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Felipe Reyes Pending
charmers Pending
Edward Hope-Morley Pending
Review via email: mp+261000@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-05-29.

To post a comment you must log in.
387. By Billy Olsen

Add templating to the os-public-hostname override per jjo's bug comment.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Thanks billy for the proposal.

I think this approach is much simpler, +1 from my side.

review: Approve
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

The jinja package requires to be installed on the system, in case of partial importing of this helper, this will not work. Please see: charmhelpers.core.templating. I

This could be replaced by a standard string replacement. see pydoc format.

Thanks billy.

review: Needs Fixing
388. By Billy Olsen

Per niedbalski's review remove jinja2 dependency and use simple string
formatting. Additionally break out the override check into its own
function.

Revision history for this message
Billy Olsen (billy-olsen) :
Revision history for this message
Jorge Niedbalski (niedbalski) :
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