lp:~gandelman-a/charms/precise/keystone/openstack-charmers-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers/charms/precise/keystone/ha-support at revision 46

OpenStack Charmers: Pending requested 2013-01-18

Diff: 347 lines (+97/-110)

5 files modified

config.yaml (+9/-0)
hooks/keystone-hooks (+18/-2)
hooks/lib/openstack_common.py (+35/-6)
hooks/utils.py (+34/-101)
revision (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

46. By Adam Gandelman on 2013-01-17

Merge all pending grizzly work into current ha branches.

45. By James Page on 2013-01-07

Switch haproxy configuration file generation to jinja2

44. By James Page on 2012-12-18

Added upgrade-charm hook

43. By Andres Rodriguez on 2012-12-18

Add missing hooks and add VIP parameters

42. By James Page on 2012-12-18

Further refinement for clustering support

41. By James Page on 2012-12-17

Merge in endpoint reconfiguration from adam_g

40. By James Page on 2012-12-17

Ripple clustering changes to related services

39. By James Page on 2012-12-17

Refactored to use alternative ports for haproxy

38. By Adam Gandelman on 2012-12-05

Trivial fix: Use correct versioning for Grizzly (2013.1).

37. By Adam Gandelman on 2012-12-03

Merge support for Quantum service from p:~james-page/charms/precise/keystone/quantum-support.