lp://staging/~1chb1n/charms/trusty/glance/next-amulet-update

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~openstack-charmers-archive/charms/trusty/glance/next at revision 122

Corey Bryant: Pending requested 2015-06-30

Diff: 1784 lines (+929/-460)

13 files modified

Makefile (+10/-15)
hooks/charmhelpers/core/hookenv.py (+92/-36)
hooks/charmhelpers/core/services/base.py (+12/-9)
metadata.yaml (+4/-2)
tests/00-setup (+6/-2)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/README (+9/-0)
tests/basic_deployment.py (+349/-340)
tests/charmhelpers/contrib/amulet/utils.py (+137/-4)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+35/-3)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+237/-49)
tests/tests.yaml (+18/-0)

api

Superseded for merging into lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk

Corey Bryant: Pending requested 2015-06-30

Diff: 3606 lines (+1746/-542) (has conflicts)

28 files modified

Makefile (+10/-15)
README.md (+77/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+46/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3)
hooks/charmhelpers/contrib/openstack/context.py (+1/-1)
hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9)
hooks/charmhelpers/contrib/openstack/utils.py (+82/-22)
hooks/charmhelpers/contrib/python/packages.py (+30/-5)
hooks/charmhelpers/core/hookenv.py (+231/-38)
hooks/charmhelpers/core/host.py (+25/-7)
hooks/charmhelpers/core/services/base.py (+43/-19)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
hooks/charmhelpers/fetch/giturl.py (+7/-5)
hooks/glance_relations.py (+3/-3)
hooks/glance_utils.py (+50/-4)
metadata.yaml (+1/-1)
tests/00-setup (+5/-1)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/README (+9/-0)
tests/basic_deployment.py (+288/-326)
tests/charmhelpers/contrib/amulet/utils.py (+228/-10)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+41/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+358/-51)
tests/tests.yaml (+18/-0)
unit_tests/test_glance_relations.py (+11/-5)
unit_tests/test_glance_utils.py (+17/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

126. By Ryan Beisner on 2015-07-02

update tests for vivid-kilo

125. By Ryan Beisner on 2015-07-01

update tags for consistency with other openstack charms

124. By Ryan Beisner on 2015-06-30

update tests

123. By Ryan Beisner on 2015-06-26

sync tests/charmhelpers

122. By Ryan Beisner on 2015-06-26

sync hooks/charmhelpers

121. By Liam Young on 2015-06-26

[corey.bryant, r=gnuoy] charmhelper sync

120. By Billy Olsen on 2015-06-22

[corey.bryant,r=billy-olsen] Fix global requirements for git-deploy.

119. By Corey Bryant on 2015-06-10

[billy-olsen,r=corey.bryant] Provide support for user-specified public endpoint hostname.

118. By James Page on 2015-06-09

Add support for leader-election

117. By James Page on 2015-06-03

Fixup glance-api template sections for Kilo release.