Charm Helpers

Merge lp://staging/~james-page/charm-helpers/pikeandqueens into lp://staging/charm-helpers

pikeandqueens
Merge into devel

Proposed by James Page on 2017-05-09

Status:	Merged
Merged at revision:	740
Proposed branch:	lp://staging/~james-page/charm-helpers/pikeandqueens
Merge into:	lp://staging/charm-helpers
Diff against target:	166 lines (+43/-1) 3 files modified charmhelpers/contrib/openstack/amulet/deployment.py (+5/-1) charmhelpers/contrib/openstack/utils.py (+37/-0) charmhelpers/core/host_factory/ubuntu.py (+1/-0)
To merge this branch:	bzr merge lp://staging/~james-page/charm-helpers/pikeandqueens
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alex Kavanagh			Approve on 2017-05-09
James Page			Needs Resubmitting on 2017-05-09
Review via email: mp+323789@code.staging.launchpad.net

Description of the change

Add support for pike and queens

Revision history for this message

Alex Kavanagh (ajkavanagh) wrote on 2017-05-09:

I think that the following also needs updating as part of the same commit:

- charmhelpers/core/host_factory/ubuntu.py -- L#20 probably needs 'artful' adding.
- charmhelpers/contrib/openstack/amulet/deployment.py -- around L#276 in the methods _get_openstack_release() and _get_openstack_release_string()

This functions also relate to OpenStack and Ubuntu releases.

review: Needs Fixing

lp://staging/~james-page/charm-helpers/pikeandqueens updated on 2017-05-09