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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk at revision 71

OpenStack Charmers: Pending requested 2014-04-10

Diff: 2203 lines (+1381/-122)

31 files modified

Makefile (+1/-2)
README.txt (+15/-0)
config.yaml (+6/-1)
hooks/charmhelpers/contrib/hahelpers/apache.py (+9/-8)
hooks/charmhelpers/contrib/openstack/context.py (+106/-25)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-4)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+12/-3)
hooks/nova_cc_context.py (+45/-4)
hooks/nova_cc_hooks.py (+73/-11)
hooks/nova_cc_utils.py (+211/-33)
metadata.yaml (+4/-0)
setup.cfg (+5/-0)
templates/essex/nova.conf (+1/-1)
templates/folsom/nova.conf (+8/-3)
templates/folsom/ovs_quantum_plugin.ini (+1/-1)
templates/grizzly/nova.conf (+115/-0)
templates/grizzly/quantum.conf (+45/-0)
templates/havana/neutron.conf (+7/-6)
templates/havana/nova.conf (+119/-0)
templates/havana/nvp.ini (+0/-7)
templates/havana/ovs_neutron_plugin.ini (+0/-7)
templates/icehouse/etc_nova_api-paste.ini (+124/-0)
templates/icehouse/ml2_conf.ini (+30/-0)
templates/icehouse/neutron.conf (+71/-0)
templates/icehouse/nova.conf (+130/-0)
templates/parts/database (+3/-0)
templates/parts/rabbitmq (+21/-0)
templates/parts/section-database (+4/-0)
unit_tests/test_nova_cc_hooks.py (+97/-4)
unit_tests/test_nova_cc_utils.py (+103/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

74. By James Page on 2014-04-16

fixup merge break

73. By James Page on 2014-04-16

Fixup another merge bug

72. By James Page on 2014-04-16

Fixup merge break

71. By James Page on 2014-04-16

[james-page,hazmat,ivoks,coreycb,yolanda.robla,r=james-page,t=*]

Support for Icehouse on 12.04 and 14.04
Support for Active/Active and SSL RabbitMQ
Support for SSL MySQL
Support for SSL endpoints
Support for PostgreSQL

Fixes for upgrades on 12.04 grizzly->havana->icehouse

70. By Edward Hope-Morley on 2014-04-11

[heut2008,r=hopem]

Fix authorized_keys file becomes incorrect after removing a compute node and
then add a new node.

69. By Edward Hope-Morley on 2014-03-26

[hopem] Added support for logging to syslog

68. By Edward Hope-Morley on 2014-02-27

[hopem] synced charm-helpers to fix neutron_url bad port

67. By James Page on 2014-02-26

[hopem,r=james-page,t=hopem]

Fixup handling on neutron_url for https and clustered configurations.

66. By James Page on 2014-02-26

[yolanda.robla,t=james-page,r=james-page]

Drop misc_utils.py - not required
Add missing database section and configuration for NVP plugin
Drop keystone_authtoken section of OVS plugin configuration as already defined in neutron.conf

65. By James Page on 2014-02-19

[trivial] Revert setting of neutron_url until it actually works