Merge lp://qastaging/~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Proposed by
James Page
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk |
Diff against target: |
5572 lines (+3220/-634) (has conflicts) 74 files modified
.bzrignore (+1/-0) Makefile (+2/-3) README.md (+0/-7) actions.yaml (+2/-0) actions/git_reinstall.py (+45/-0) config.yaml (+46/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+44/-8) hooks/charmhelpers/contrib/hahelpers/ceph.py (+0/-294) hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1) hooks/charmhelpers/contrib/network/ip.py (+84/-1) hooks/charmhelpers/contrib/network/ufw.py (+71/-16) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+34/-5) hooks/charmhelpers/contrib/openstack/context.py (+288/-14) hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0) hooks/charmhelpers/contrib/openstack/ip.py (+37/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+83/-0) hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0) hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0) hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0) hooks/charmhelpers/contrib/openstack/utils.py (+142/-141) hooks/charmhelpers/contrib/python/debug.py (+56/-0) hooks/charmhelpers/contrib/python/packages.py (+2/-2) hooks/charmhelpers/contrib/python/rpdb.py (+58/-0) hooks/charmhelpers/contrib/python/version.py (+34/-0) hooks/charmhelpers/core/fstab.py (+4/-4) hooks/charmhelpers/core/hookenv.py (+40/-1) hooks/charmhelpers/core/host.py (+10/-6) hooks/charmhelpers/core/services/helpers.py (+12/-4) hooks/charmhelpers/core/strutils.py (+42/-0) hooks/charmhelpers/core/sysctl.py (+2/-2) hooks/charmhelpers/core/templating.py (+3/-3) hooks/charmhelpers/core/unitdata.py (+477/-0) hooks/charmhelpers/fetch/archiveurl.py (+10/-10) hooks/charmhelpers/fetch/giturl.py (+1/-1) hooks/nova_compute_context.py (+41/-2) hooks/nova_compute_hooks.py (+56/-8) hooks/nova_compute_utils.py (+254/-13) metadata.yaml (+3/-0) templates/git/nova-compute-kvm.conf (+4/-0) templates/git/nova-compute-lxc.conf (+4/-0) templates/git/nova-compute-qemu.conf (+4/-0) templates/git/nova-compute-vmware.conf (+2/-0) templates/git/nova-compute-xen.conf (+4/-0) templates/git/nova_sudoers (+4/-0) templates/git/nova_tgt.conf (+1/-0) templates/git/upstart/nova-compute.upstart (+27/-0) templates/havana/nova.conf (+18/-1) templates/icehouse/nova.conf (+155/-0) templates/juno/nova.conf (+27/-1) templates/kilo/nova.conf (+32/-5) templates/libvirt-bin.override (+3/-0) templates/libvirtd.conf (+1/-1) templates/parts/section-database (+4/-0) tests/016-basic-trusty-juno (+11/-0) tests/017-basic-trusty-kilo (+11/-0) tests/018-basic-utopic-juno (+9/-0) tests/019-basic-vivid-kilo (+9/-0) tests/050-basic-trusty-icehouse-git (+9/-0) tests/051-basic-trusty-juno-git (+12/-0) tests/10-basic-precise-essex (+0/-9) tests/11-basic-precise-folsom (+0/-17) tests/12-basic-precise-grizzly (+0/-11) tests/13-basic-precise-havana (+0/-11) tests/basic_deployment.py (+26/-5) tests/charmhelpers/contrib/amulet/utils.py (+125/-3) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+34/-5) unit_tests/__init__.py (+1/-0) unit_tests/test_actions_git_reinstall.py (+96/-0) unit_tests/test_nova_compute_contexts.py (+40/-11) unit_tests/test_nova_compute_hooks.py (+74/-2) unit_tests/test_nova_compute_utils.py (+342/-6) Text conflict in hooks/nova_compute_context.py Text conflict in hooks/nova_compute_utils.py |
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.