lp:~gnuoy/charms/trusty/nova-cloud-controller/workload-status

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next at revision 200

OpenStack Charmers: Pending requested 2015-10-08

Diff: 388 lines (+108/-17)

10 files modified

hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+15/-4)
hooks/charmhelpers/contrib/openstack/neutron.py (+3/-3)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/nova_cc_context.py (+15/-2)
hooks/nova_cc_hooks.py (+20/-3)
hooks/nova_cc_utils.py (+43/-3)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
unit_tests/test_nova_cc_hooks.py (+1/-0)
unit_tests/test_utils.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

200. By Liam Young on 2015-10-08

Use new format for workload status

199. By Liam Young on 2015-10-07

Add workload status

198. By Liam Young on 2015-10-06

CH sync

197. By Liam Young on 2015-10-05

[tribaal, r=gnuoy] This branch enables API rate-limiting in the nova-cloud-controller charm

196. By Liam Young on 2015-09-29

[jjo,gnuoy,r=thedac] jjo: only add neutron-server to HAProxyContext if neutron-api relation is not made, fixes lp#1476394. gnuoy: added unit tests

195. By Liam Young on 2015-09-28

[hopem, r=gnuoy] Sync charmhelpers to get fix for bug 1499643

194. By Liam Young on 2015-09-28

[gnuoy, trivial] Fix typo from resolving conflict

193. By Liam Young on 2015-09-28

[freyes, r=gnuoy]

    Expose scheduler_default_filters as a config option

    Fixes LP: #1387073

192. By Edward Hope-Morley on 2015-09-25

[hopem,r=gnuoy]

No more trusty-backports for haproxy >= Liberty

Closes-Bug: 1499435

191. By James Page on 2015-09-24

[thedac,r=james-page] Add support for action managed openstack upgrades.

Also fix misc assert_called problems in unit tests.