Merge lp://staging/~1chb1n/charms/trusty/cinder-ceph/next-amulet-updates into lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next
Proposed by
Ryan Beisner
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 33 | ||||
Proposed branch: | lp://staging/~1chb1n/charms/trusty/cinder-ceph/next-amulet-updates | ||||
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next | ||||
Diff against target: |
4033 lines (+3034/-165) 35 files modified
Makefile (+12/-4) charm-helpers-tests.yaml (+5/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+47/-3) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) hooks/charmhelpers/contrib/openstack/context.py (+1/-1) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9) hooks/charmhelpers/contrib/openstack/utils.py (+82/-22) hooks/charmhelpers/contrib/python/packages.py (+30/-5) hooks/charmhelpers/core/hookenv.py (+231/-38) hooks/charmhelpers/core/host.py (+25/-7) hooks/charmhelpers/core/services/base.py (+43/-19) hooks/charmhelpers/fetch/__init__.py (+1/-1) hooks/charmhelpers/fetch/giturl.py (+7/-5) metadata.yaml (+5/-2) tests/00-setup (+14/-0) tests/014-basic-precise-icehouse (+11/-0) tests/015-basic-trusty-icehouse (+9/-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/README (+66/-0) tests/basic_deployment.py (+683/-0) tests/charmhelpers/__init__.py (+38/-0) tests/charmhelpers/contrib/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/deployment.py (+93/-0) tests/charmhelpers/contrib/amulet/utils.py (+533/-0) tests/charmhelpers/contrib/openstack/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+183/-0) tests/charmhelpers/contrib/openstack/amulet/utils.py (+604/-0) tests/tests.yaml (+18/-0) |
||||
To merge this branch: | bzr merge lp://staging/~1chb1n/charms/trusty/cinder-ceph/next-amulet-updates | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corey Bryant | Approve | ||
Review via email: mp+262910@code.staging.launchpad.net |
Description of the change
Add cinder-ceph amulet tests
To post a comment you must log in.
charm_lint_check #5601 cinder-ceph-next for 1chb1n mp262910
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/5601/