lp:~corey.bryant/charms/trusty/nova-compute/amulet-updates
Created by
Corey Bryant
and last modified
- Get this branch:
- bzr branch lp:~corey.bryant/charms/trusty/nova-compute/amulet-updates
Only
Corey Bryant
can upload to this branch. If you are
Corey Bryant
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- OpenStack Charmers: Pending requested
-
Diff: 1364 lines (+620/-152)24 files modifiedMakefile (+2/-1)
hooks/charmhelpers/contrib/hahelpers/apache.py (+10/-3)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+1/-2)
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/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)
hooks/nova_compute_context.py (+3/-3)
tests/00-setup (+4/-4)
tests/README (+6/-0)
tests/basic_deployment.py (+24/-11)
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)
Branch information
- Owner:
- Corey Bryant
- Status:
- Development
Recent revisions
- 82. By Corey Bryant
-
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
- Let things settle with short sleep after deployment
- Use dicts in add_services
- Rename restart test
- Cleanup on test failure - 78. By Liam Young
-
[corey.bryant, r=gnuoy] This fixes an error where the virsh command uses the default URI, which may or may not match the hypervisor specified in the virt-type config option. For example, if virt-type=lxc, the qemu:///system URI is used, whereas the correct URI that should be used is lxc:///.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)