lp:~fcorrea/charms/trusty/glance/fix-pause-action

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/glance/next

Chad Smith: Pending requested 2015-11-24

Diff: 1327 lines (+543/-93)

20 files modified

actions/actions.py (+6/-3)
charmhelpers/cli/__init__.py (+3/-3)
charmhelpers/contrib/charmsupport/nrpe.py (+44/-8)
charmhelpers/contrib/openstack/amulet/deployment.py (+102/-2)
charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
charmhelpers/contrib/openstack/context.py (+39/-9)
charmhelpers/contrib/openstack/neutron.py (+16/-2)
charmhelpers/contrib/openstack/utils.py (+22/-1)
charmhelpers/contrib/storage/linux/ceph.py (+51/-35)
charmhelpers/core/hookenv.py (+16/-2)
charmhelpers/core/host.py (+34/-3)
charmhelpers/core/hugepage.py (+2/-0)
charmhelpers/core/services/helpers.py (+5/-2)
charmhelpers/core/templating.py (+13/-6)
charmhelpers/fetch/__init__.py (+1/-1)
charmhelpers/fetch/bzrurl.py (+7/-3)
hooks/glance_utils.py (+20/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+102/-2)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
unit_tests/test_actions.py (+10/-5)

api

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

Landscape: Pending requested 2015-11-24

Diff: 12620 lines (+12105/-44) (has conflicts)

54 files modified

.bzrignore (+2/-0)
.testr.conf (+8/-0)
actions/actions.py (+59/-0)
actions/openstack_upgrade.py (+28/-0)
charm-helpers-hooks.yaml (+5/-0)
charmhelpers.new/cli/__init__.py (+191/-0)
charmhelpers.new/cli/benchmark.py (+36/-0)
charmhelpers.new/cli/commands.py (+32/-0)
charmhelpers.new/cli/hookenv.py (+23/-0)
charmhelpers.new/cli/host.py (+31/-0)
charmhelpers.new/cli/unitdata.py (+39/-0)
charmhelpers.new/contrib/charmsupport/nrpe.py (+396/-0)
charmhelpers.new/contrib/hahelpers/cluster.py (+316/-0)
charmhelpers.new/contrib/network/ip.py (+456/-0)
charmhelpers.new/contrib/openstack/amulet/deployment.py (+297/-0)
charmhelpers.new/contrib/openstack/amulet/utils.py (+985/-0)
charmhelpers.new/contrib/openstack/context.py (+1457/-0)
charmhelpers.new/contrib/openstack/ip.py (+151/-0)
charmhelpers.new/contrib/openstack/neutron.py (+370/-0)
charmhelpers.new/contrib/openstack/templates/ceph.conf (+21/-0)
charmhelpers.new/contrib/openstack/templating.py (+323/-0)
charmhelpers.new/contrib/openstack/utils.py (+998/-0)
charmhelpers.new/contrib/python/packages.py (+121/-0)
charmhelpers.new/contrib/storage/linux/ceph.py (+673/-0)
charmhelpers.new/core/files.py (+45/-0)
charmhelpers.new/core/hookenv.py (+944/-0)
charmhelpers.new/core/host.py (+617/-0)
charmhelpers.new/core/hugepage.py (+71/-0)
charmhelpers.new/core/kernel.py (+68/-0)
charmhelpers.new/core/services/base.py (+353/-0)
charmhelpers.new/core/services/helpers.py (+286/-0)
charmhelpers.new/core/strutils.py (+72/-0)
charmhelpers.new/core/templating.py (+75/-0)
charmhelpers.new/core/unitdata.py (+521/-0)
charmhelpers.new/fetch/__init__.py (+456/-0)
charmhelpers.new/fetch/archiveurl.py (+167/-0)
charmhelpers.new/fetch/bzrurl.py (+82/-0)
charmhelpers.new/fetch/giturl.py (+73/-0)
hooks/glance_relations.py (+19/-3)
hooks/glance_utils.py (+115/-29)
metadata.yaml (+12/-2)
requirements/requirements-precise.txt (+6/-0)
requirements/requirements-trusty.txt (+6/-0)
requirements/test-requirements.txt (+7/-0)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/052-basic-trusty-kilo-git (+12/-0)
tests/basic_deployment.py (+7/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+126/-9)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+650/-1)
tests/tests.yaml (+20/-0)
tox.ini (+35/-0)
unit_tests/test_actions.py (+162/-0)
unit_tests/test_actions_openstack_upgrade.py (+60/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

155. By Fernando Correa Neto on 2015-11-24

- backport changes from previous branch

154. By Fernando Correa Neto on 2015-11-24

- get new charmhelpers

153. By James Page on 2015-11-18

Update maintainer

152. By David Ames on 2015-11-02

[ionutbalutoiu, r=thedac] Adds additional variables to the image-service relation. These are available only when a relation with Swift object storage is present.
In case any charm needs to generate temporary URLs from Glance with Swift backend, it needs a temp-url-key which must be posted to Swift with the glance account. (Details: http://docs.openstack.org/liberty/config-reference/content/object-storage-tempurl.html)
This is needed for OpenStack Ironic charm (http://bazaar.launchpad.net/~cloudbaseit/charms/trusty/ironic/trunk/view/head:/hooks/ironic_context.py#L76), but might also be generally useful.

151. By Corey Bryant on 2015-10-09

[ddellav,r=corey.bryant] Action managed upgrade support.

150. By James Page on 2015-10-07

Refactor to assess status after every hook execution, add update-status hook

149. By Corey Bryant on 2015-10-07

[beisner,r=corey.bryant] Add Amulet test dependencies and run unit tests with -v.

148. By David Ames on 2015-10-06

[thedac,r=gnuoy] Make messaging an optional relation for workload status

147. By David Ames on 2015-10-02

[thedac, trivial] s/message/messaging

146. By Corey Bryant on 2015-09-30

[ack,r=corey.bryant] Fix amulet tests for pause/resume actions and sync charm-helpers