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
Reviewer Review Type Date Requested Status
Billy Olsen Approve
OpenStack Charmers Pending
Review via email: mp+242926@code.qastaging.launchpad.net

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.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_lint_check #1226 quantum-gateway-next for niedbalski mp242926
    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/
Build: http://10.98.191.181:8080/job/charm_lint_check/1226/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_unit_test #1060 quantum-gateway-next for niedbalski mp242926
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/quantum_hooks 108 2 98% 204-206
  hooks/quantum_utils 207 1 99% 389
  TOTAL 458 9 98%
  Ran 85 tests in 3.389s
  OK

Full unit test output: http://paste.ubuntu.com/9252807/
Build: http://10.98.191.181:8080/job/charm_unit_test/1060/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

UOSCI bot says:
charm_amulet_test #529 quantum-gateway-next for niedbalski mp242926
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9253062/
Build: http://10.98.191.181:8080/job/charm_amulet_test/529/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM. Per our conversation niedbalski, it may be nice to have this integrated into one of the contexts so we can apply it throughout the openstack charms.

review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #91 quantum-gateway-next for niedbalski mp242926
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/91/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #124 quantum-gateway-next for niedbalski mp242926
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/124/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #70 quantum-gateway-next for niedbalski mp242926
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9491242/
Build: http://10.245.162.77:8080/job/charm_amulet_test/70/

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches