lp:~1chb1n/charms/trusty/swift-storage/amulet-update-1508

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next at revision 77

Corey Bryant (community): Approve on 2015-08-25

Adam Collard (community): Approve on 2015-08-24

Diff: 494 lines (+166/-120)

8 files modified

Makefile (+6/-9)
metadata.yaml (+2/-1)
tests/00-setup (+7/-3)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/README (+10/-0)
tests/basic_deployment.py (+102/-107)
tests/tests.yaml (+19/-0)

api

Superseded for merging into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

OpenStack Charmers: Pending requested 2015-08-21

Diff: 2689 lines (+1668/-252) (has conflicts)

39 files modified

.coveragerc (+2/-1)
Makefile (+7/-7)
actions.yaml (+5/-0)
actions/actions.py (+93/-0)
charm-helpers-hooks.yaml (+5/-0)
charmhelpers/cli/__init__.py (+191/-0)
charmhelpers/cli/benchmark.py (+36/-0)
charmhelpers/cli/commands.py (+32/-0)
charmhelpers/cli/hookenv.py (+23/-0)
charmhelpers/cli/host.py (+31/-0)
charmhelpers/cli/unitdata.py (+39/-0)
charmhelpers/contrib/openstack/amulet/deployment.py (+7/-1)
charmhelpers/contrib/openstack/context.py (+22/-5)
charmhelpers/contrib/openstack/neutron.py (+40/-3)
charmhelpers/contrib/openstack/utils.py (+51/-14)
charmhelpers/contrib/storage/linux/utils.py (+3/-2)
charmhelpers/core/files.py (+45/-0)
charmhelpers/core/hookenv.py (+48/-4)
charmhelpers/core/host.py (+150/-41)
charmhelpers/core/hugepage.py (+62/-0)
charmhelpers/core/services/helpers.py (+26/-2)
charmhelpers/fetch/__init__.py (+8/-0)
hooks/swift_storage_hooks.py (+1/-1)
lib/swift_storage_utils.py (+1/-15)
metadata.yaml (+2/-1)
setup.cfg (+2/-2)
tests/00-setup (+8/-3)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/README (+10/-0)
tests/basic_deployment.py (+190/-141)
tests/charmhelpers/contrib/amulet/utils.py (+237/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+7/-1)
tests/tests.yaml (+20/-0)
unit_tests/__init__.py (+0/-2)
unit_tests/test_actions.py (+239/-0)
unit_tests/test_swift_storage_context.py (+1/-1)
unit_tests/test_swift_storage_relations.py (+3/-3)
unit_tests/test_swift_storage_utils.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

82. By Ryan Beisner on 2015-08-24

adjust tests.yaml for superfluous python-amulet

81. By Ryan Beisner on 2015-08-22

update makefile, correct import order

80. By Ryan Beisner on 2015-08-21

switch from service_restarted to validate_service_config_changed re: race on vivid; update tests for consistency with swift-proxy tests.

79. By Ryan Beisner on 2015-08-21

add liberty amulet test targets (disabled pending liberty pkgs)

78. By Ryan Beisner on 2015-08-21

update amulet tests

77. By Ryan Beisner on 2015-08-20

update makefile, test dependencies, meta categories; disable essex amulet test

76. By Liam Young on 2015-08-19

[gnuoy,trivial] Charmhelper sync (+1'd by mojo)

75. By Corey Bryant on 2015-08-18

[corey.bryant,r=trivial] Sync charm-helpers.

74. By Liam Young on 2015-08-18

[adam-collard, r=gnuoy] This branch adds actions for pausing and resuming services on swift-storage units.

73. By Liam Young on 2015-08-18

[adam-collard, r=gnuoy] Sync charm-helpers and use the (new-ish) validate_services_by_name() utility to properly check that all swift services are starting.