lp:~corey.bryant/charms/trusty/nova-cloud-controller/amulet-updates

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 110

OpenStack Charmers: Pending requested 2014-09-30

Diff: 1481 lines (+696/-177)

23 files modified

Makefile (+2/-1)
hooks/charmhelpers/contrib/hahelpers/apache.py (+10/-3)
hooks/charmhelpers/contrib/network/ip.py (+100/-16)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+38/-8)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+5/-4)
hooks/charmhelpers/contrib/openstack/context.py (+75/-24)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+9/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+9/-8)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+9/-8)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+77/-29)
hooks/charmhelpers/core/hookenv.py (+42/-16)
hooks/charmhelpers/core/host.py (+30/-5)
hooks/charmhelpers/core/services/base.py (+3/-0)
hooks/charmhelpers/core/services/helpers.py (+119/-5)
hooks/charmhelpers/fetch/__init__.py (+19/-5)
hooks/charmhelpers/fetch/archiveurl.py (+49/-4)
tests/00-setup (+4/-4)
tests/README (+6/-0)
tests/basic_deployment.py (+27/-12)
tests/charmhelpers/contrib/amulet/deployment.py (+19/-13)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+38/-8)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+5/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

105. By Corey Bryant on 2014-09-29

Sync charm-helpers to pick up lint fix.

104. By Corey Bryant on 2014-09-29

Amulet test fixes:
  * Makefile: Only run precise-icehouse and trusty-icehouse tests by default
    and increase test timeout
  * t/00-setup: Simplify dependencies install
  * t/README: Mention charm-tools dependency
  * t/basic_deployment.py:
    - Specify unstable charm deployment
    - Use dicts in add_services
    - Rename restart test
    - Cleanup on test failure

103. By Corey Bryant on 2014-09-26

Sync with charm-helpers.

102. By James Page on 2014-09-16

[james-page,r=gnuoy] Fixup sets on cluster relations to just check for presense.

101. By James Page on 2014-09-16

[james-page,r=gnuoy] Add option to allow ram overcommit to be configured.

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