lp://qastaging/~james-page/charms/trusty/swift-storage/2.5.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next at revision 87

Liam Young (community): Approve on 2015-10-12

Diff: 1058 lines (+479/-82)

17 files modified

charmhelpers/contrib/network/ip.py (+5/-3)
charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10)
charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
charmhelpers/contrib/openstack/context.py (+92/-20)
charmhelpers/contrib/openstack/neutron.py (+17/-3)
charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
charmhelpers/contrib/openstack/templating.py (+30/-2)
charmhelpers/contrib/openstack/utils.py (+182/-2)
charmhelpers/core/hookenv.py (+32/-0)
charmhelpers/core/hugepage.py (+8/-1)
charmhelpers/core/strutils.py (+30/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+47/-16)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
unit_tests/test_swift_storage_relations.py (+4/-10)
unit_tests/test_swift_storage_utils.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

88. By James Page on 2015-10-10

Fixup broken use of assert calls and drop invalid test

87. By James Page on 2015-10-10

Resync helpers for 2.5.0 version detection

86. By Corey Bryant on 2015-10-07

[beisner,r=corey.bryant] Add Amulet test dependencies.

85. By Chris Glass on 2015-10-06

Merge lp:~gnuoy/charms/trusty/swift-storage/lp1496004 [a=gnuoy] [r=tribaal]

Include mounted devices when reporting back to swift proxy

84. By Corey Bryant on 2015-09-23

[corey.bryant,trivial] Add another upgrade unit test.

83. By James Page on 2015-09-23

[thedac,r=james-page] Add action to manage upgrades

82. By James Page on 2015-09-23

Add support for deployment on Ubuntu released where python2 is not installed by default

81. By James Page on 2015-09-17

[jamespage,trivial] Resync helpers to enable liberty support.

80. By Liam Young on 2015-09-07

[adam-collard, r=gnuoy] This is a follow up branch to https://code.launchpad.net/~adam-collard/charms/trusty/swift-storage/add-pause-resume-actions/+merge/268233 to prevent config-changed from blindly (re)starting services when the unit is paused.

Normal flow is pause(), (optionally) change config -> changes should be persisted on disk, but nothing started. resume() -> services started.

79. By Liam Young on 2015-09-03

[adam-collard, r=gnuoy] This branch prevents the swift-storage charm from thinking there was an OpenStack upgrade available at every config-changed.

I had to update the Amulet tests because they were incorrectly asserting that all of the swift services should have been restarted following a change to object-server-threads-per-disk. In fact, only the object services should be restarted, and only are (the test passed prior to this because of the bug in charm-helpers which caused the unconditional OpenStack upgrade, in turn restarting all of the services)