Juju Charms Collection
cinder package

Merge lp://staging/~gnuoy/charms/trusty/cinder/next-haproxy-always into lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next

Proposed by Liam Young on 2014-11-26

Status:	Merged
Merged at revision:	60
Proposed branch:	lp://staging/~gnuoy/charms/trusty/cinder/next-haproxy-always
Merge into:	lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target:	2996 lines (+769/-498) 29 files modified 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/neutron.py (+20/-4) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-2) hooks/charmhelpers/contrib/openstack/templating.py (+5/-5) hooks/charmhelpers/contrib/openstack/utils.py (+32/-7) 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 (+30/-19) 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/cinder_contexts.py (+4/-2) hooks/cinder_utils.py (+1/-1) 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)
To merge this branch:	bzr merge lp://staging/~gnuoy/charms/trusty/cinder/next-haproxy-always
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
OpenStack Charmers		2014-11-26	Pending
Review via email: mp+242902@code.staging.launchpad.net

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-11-26:

UOSCI bot says:
charm_lint_check #1233 cinder-next for gnuoy mp242902
LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/9252849/
Build: http://10.98.191.181:8080/job/charm_lint_check/1233/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-11-26:

UOSCI bot says:
charm_unit_test #1067 cinder-next for gnuoy mp242902
UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 194 6 97% 99-100, 115, 122, 288-289
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 419 26 94%
  Ran 86 tests in 5.000s
  OK

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-11-26:

UOSCI bot says:
charm_amulet_test #536 cinder-next for gnuoy mp242902
AMULET FAIL: amulet-test failed

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

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