lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ods_merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~charmers/charms/precise/nova-cloud-controller/trunk at revision 56

Marco Ceppi (community): Abstain on 2013-11-11

OpenStack Charmers: Pending requested 2013-11-11

Diff: 1536 lines (+596/-100)

23 files modified

charm-helpers.yaml (+0/-1)
config.yaml (+29/-0)
hooks/charmhelpers/contrib/openstack/alternatives.py (+17/-0)
hooks/charmhelpers/contrib/openstack/context.py (+20/-1)
hooks/charmhelpers/contrib/openstack/neutron.py (+20/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+81/-10)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+27/-3)
hooks/charmhelpers/core/hookenv.py (+78/-23)
hooks/charmhelpers/core/host.py (+15/-9)
hooks/charmhelpers/fetch/__init__.py (+53/-5)
hooks/charmhelpers/fetch/bzrurl.py (+1/-1)
hooks/nova_cc_context.py (+10/-0)
hooks/nova_cc_hooks.py (+59/-29)
hooks/nova_cc_utils.py (+32/-2)
metadata.yaml (+3/-0)
revision (+1/-1)
templates/folsom/nova.conf (+14/-0)
templates/folsom/quantum-server (+6/-0)
templates/havana/neutron-server (+6/-0)
templates/havana/nvp.ini (+11/-0)
unit_tests/test_nova_cc_hooks.py (+63/-1)
unit_tests/test_nova_cc_utils.py (+47/-14)
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

62. By James Page on 2013-11-08

Fixup nvp- prefix in pydev files

61. By James Page on 2013-11-08

Rebase on trunk

60. By Adam Gandelman on 2013-11-06

Update and sync helpers.

59. By Adam Gandelman on 2013-11-01

Add logging.

58. By Adam Gandelman on 2013-11-01

Send restart trigger to compute side after db migration.

57. By Adam Gandelman on 2013-10-31

Update vmware interface on new keystone relation.

56. By Adam Gandelman on 2013-10-30

Pass neutron data to vmw subordinte.

55. By Adam Gandelman on 2013-10-28

Merge NVP support.

54. By Adam Gandelman on 2013-10-16

Update resource_map() to inspect vmware context for any additional services to manage.

53. By Adam Gandelman on 2013-10-16

Merge trunk.