Juju Charms Collection
glance package

Merge lp://staging/~gandelman-a/charms/precise/glance/merge_resolve_conflicts into lp://staging/~openstack-charmers/charms/precise/glance/ha-support

Proposed by Adam Gandelman on 2013-06-03

Status:	Merged
Merged at revision:	53
Proposed branch:	lp://staging/~gandelman-a/charms/precise/glance/merge_resolve_conflicts
Merge into:	lp://staging/~openstack-charmers/charms/precise/glance/ha-support
Diff against target:	192 lines (+69/-77) 3 files modified hooks/glance-common (+24/-65) hooks/glance-relations (+13/-12) hooks/lib/openstack-common (+32/-0)
To merge this branch:	bzr merge lp://staging/~gandelman-a/charms/precise/glance/merge_resolve_conflicts
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2013-06-03	Approve on 2013-06-03
Review via email: mp+167123@code.staging.launchpad.net

Description of the change

Rebases against upstream charm, resolves conflicts. Conflicts occurred because upstream charm had some work done around setting config file values with ConfigParser, while our ha-support branch touched these areas to deal with avoiding service restarts. Updated our branch to use new ConfigParser approach while preserving our CONFIG_CHANGED tracking.

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2013-06-03:

lgtm!

One question though, should the set_or_update being modified here be changed to use cfg_set_or_update instead?

review: Needs Information

Revision history for this message

Adam Gandelman (gandelman-a) wrote on 2013-06-03:

Hmm. not sure what you mean. This turns set_or_update() into a wrapper around cfg_set_or_update() + local_config_get(). The rest of the charm uses set_or_update as it always has.

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2013-06-03:

I see now! I missed that!

review: Approve