lp:~james-page/charms/trusty/nova-cloud-controller/ram-allocation-ratio

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 101

Liam Young (community): Approve on 2014-09-16

Diff: 36 lines (+10/-0)

3 files modified

config.yaml (+8/-0)
hooks/nova_cc_context.py (+1/-0)
templates/icehouse/nova.conf (+1/-0)

api

Superseded for merging into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

OpenStack Charmers: Pending requested 2014-09-16

Diff: 5890 lines (+4147/-361) (has conflicts)

49 files modified

.bzrignore (+2/-0)
Makefile (+24/-1)
README.txt (+10/-0)
charm-helpers-hooks.yaml (+12/-0)
charm-helpers-tests.yaml (+5/-0)
config.yaml (+100/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+3/-2)
hooks/charmhelpers/contrib/network/ip.py (+174/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+61/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+275/-0)
hooks/charmhelpers/contrib/openstack/context.py (+121/-25)
hooks/charmhelpers/contrib/openstack/ip.py (+79/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+9/-4)
hooks/charmhelpers/contrib/openstack/templating.py (+22/-23)
hooks/charmhelpers/contrib/openstack/utils.py (+18/-5)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+83/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+7/-5)
hooks/charmhelpers/core/host.py (+47/-8)
hooks/charmhelpers/core/services/__init__.py (+2/-0)
hooks/charmhelpers/core/services/base.py (+310/-0)
hooks/charmhelpers/core/services/helpers.py (+125/-0)
hooks/charmhelpers/core/templating.py (+51/-0)
hooks/charmhelpers/fetch/__init__.py (+97/-28)
hooks/nova_cc_context.py (+51/-2)
hooks/nova_cc_hooks.py (+286/-61)
hooks/nova_cc_utils.py (+369/-163)
metadata.yaml (+2/-0)
revision (+1/-1)
templates/havana/nova.conf (+11/-2)
templates/icehouse/neutron.conf (+5/-0)
templates/icehouse/nova.conf (+18/-2)
tests/00-setup (+10/-0)
tests/10-basic-precise-essex (+10/-0)
tests/11-basic-precise-folsom (+18/-0)
tests/12-basic-precise-grizzly (+12/-0)
tests/13-basic-precise-havana (+12/-0)
tests/14-basic-precise-icehouse (+12/-0)
tests/15-basic-trusty-icehouse (+10/-0)
tests/README (+47/-0)
tests/basic_deployment.py (+520/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+71/-0)
tests/charmhelpers/contrib/amulet/utils.py (+176/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+61/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+275/-0)
unit_tests/test_nova_cc_hooks.py (+262/-13)
unit_tests/test_nova_cc_utils.py (+140/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

101. By James Page on 2014-09-16

Add support for increasing the ram allocation ratio

100. By James Page on 2014-09-12

[gnuoy,r=james-page] Ensure services are not running prior to a db sync.

Resolves two issues

1) Co-ordination of db sync activity across multiple nodes.

2) Ensures services are not started unil db sync is complete.

99. By James Page on 2014-09-12

[james-page,r=tribaal] Add sane defaults and options for configuring the number of API works and the default CPU overcommit ratio for compute.

98. By James Page on 2014-09-12

[gnuoy,r=james-page] Add fix db sync race with remote MySQL ACL's in HA configurations.

97. By James Page on 2014-09-04

[trivial] Fixup creation of vip group for HA

96. By James Page on 2014-09-04

[trivial] ensure neutron/quantum configuration is registered before writing

95. By Liam Young on 2014-08-26

Sync charm helpers

94. By Liam Young on 2014-08-13

[gnuoy, rs=jamespage] Sync charm-helpers from lp:charm-helpers

93. By James Page on 2014-08-01

[heut2008,r=james=page] Ensure use_syslog is populated into configuration files.

92. By James Page on 2014-07-31

[gnuoy,r=james-page,t=james-page] Add support for console access to instances.