Merge lp://qastaging/~niedbalski/charms/trusty/quantum-gateway/lp-1396607 into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Proposed by
Jorge Niedbalski
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~niedbalski/charms/trusty/quantum-gateway/lp-1396607 |
Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next |
Diff against target: |
3150 lines (+817/-526) 30 files modified
config.yaml (+7/-1) hooks/charmhelpers/contrib/hahelpers/cluster.py (+16/-7) hooks/charmhelpers/contrib/network/ip.py (+52/-50) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1) hooks/charmhelpers/contrib/openstack/context.py (+319/-226) hooks/charmhelpers/contrib/openstack/ip.py (+41/-27) hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4) hooks/charmhelpers/contrib/openstack/templating.py (+5/-5) hooks/charmhelpers/contrib/openstack/utils.py (+35/-12) hooks/charmhelpers/contrib/storage/linux/ceph.py (+89/-102) hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4) hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/fstab.py (+10/-8) hooks/charmhelpers/core/hookenv.py (+25/-11) hooks/charmhelpers/core/host.py (+22/-18) hooks/charmhelpers/core/services/__init__.py (+2/-2) hooks/charmhelpers/core/services/helpers.py (+9/-5) hooks/charmhelpers/core/templating.py (+2/-1) hooks/charmhelpers/fetch/__init__.py (+18/-12) hooks/charmhelpers/fetch/archiveurl.py (+53/-16) hooks/charmhelpers/fetch/bzrurl.py (+5/-1) hooks/charmhelpers/fetch/giturl.py (+48/-0) hooks/quantum_hooks.py (+8/-0) tests/charmhelpers/contrib/amulet/deployment.py (+3/-3) tests/charmhelpers/contrib/amulet/utils.py (+6/-4) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1) unit_tests/test_quantum_hooks.py (+4/-1) |
To merge this branch: | bzr merge lp://qastaging/~niedbalski/charms/trusty/quantum-gateway/lp-1396607 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Approve | ||
OpenStack Charmers | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-11-26.
This proposal has been superseded by a proposal from 2014-12-19.
Description of the change
Fix for LP: #1396607
To post a comment you must log in.
Unmerged revisions
- 79. By Jorge Niedbalski
-
[hooks] config_changed checks for "sysctl". fixes LP: #1366598
- 78. By Jorge Niedbalski
-
[all] make "sync"
- 77. By Jorge Niedbalski
-
[hooks] config_changed checks for "sysctl". fixes LP: #1366598
UOSCI bot says: gateway- next for niedbalski mp242926
charm_lint_check #1226 quantum-
LINT OK: passed
LINT Results (max last 5 lines):
I: config.yaml: option sysctl has no default value
I: config.yaml: option os-data-network has no default value
I: config.yaml: option data-port has no default value
I: config.yaml: option instance-mtu has no default value
I: config.yaml: option external-network-id has no default value
Full lint test output: http:// paste.ubuntu. com/9252804/ 10.98.191. 181:8080/ job/charm_ lint_check/ 1226/
Build: http://