Merge lp://qastaging/~nick-moffitt/charms/trusty/keystone/add-admin-relation into lp://qastaging/~openstack-charmers-archive/charms/precise/keystone/trunk

Proposed by Nick Moffitt
Status: Superseded
Proposed branch: lp://qastaging/~nick-moffitt/charms/trusty/keystone/add-admin-relation
Merge into: lp://qastaging/~openstack-charmers-archive/charms/precise/keystone/trunk
Diff against target: 68 lines (+25/-1)
4 files modified
.bzrignore (+1/-0)
hooks/keystone_hooks.py (+22/-0)
metadata.yaml (+2/-0)
revision (+0/-1)
To merge this branch: bzr merge lp://qastaging/~nick-moffitt/charms/trusty/keystone/add-admin-relation
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Nick Moffitt (community) Approve
Review via email: mp+218426@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-06-23.

Description of the change

This is a refresh of https://code.launchpad.net/~hloeung/charms/precise/keystone/add-admin-relation/+merge/212759 designed to bring it up to date with the trusty version of the charm (which uses modern charm-helpers, for a start).

To post a comment you must log in.
Revision history for this message
Nick Moffitt (nick-moffitt) wrote :

2014-05-06 13:47:55 INFO install Traceback (most recent call last):
2014-05-06 13:47:55 INFO install File "/var/lib/juju/agents/unit-keystone-0/charm/hooks/install", line 40, in <module>
2014-05-06 13:47:55 INFO install from keystone_utils import (
2014-05-06 13:47:55 INFO install ImportError: cannot import name stored_passwd
2014-05-06 13:47:55 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1

Well now, I'll need to fix that then...

review: Needs Fixing
65. By Nick Moffitt

STORED_PASSWD got capitalised in recent keystone_utils

Revision history for this message
Nick Moffitt (nick-moffitt) wrote :

Okay, looks like stored_passwd got the ALL_CAPS treatment for consistency, and we're good now.

review: Approve
66. By Nick Moffitt

hostname is empty, so we use private-address now

Revision history for this message
James Page (james-page) :
review: Needs Fixing

Unmerged revisions

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