Merge lp:~thedac/charms/trusty/swift-storage/setup-storage-on-config-changed into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[David Ames]

Run setup_storage() on config-changed hook in case block-device has changed.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11901 swift-storage-next for thedac mp274477
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11067 swift-storage-next for thedac mp274477
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7340 swift-storage-next for thedac mp274477
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7340/

[Corey Bryant (corey.bryant)]

Reviewed and tested successfully. Thanks!

review: Approve

=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2015-10-13 19:05:02 +0000
+++ hooks/swift_storage_hooks.py	2015-10-14 22:24:00 +0000
@@ -79,6 +79,7 @@
         status_set('maintenance', 'Configuring ipv6')
         assert_charm_supports_ipv6()
 
+    setup_storage()
     ensure_swift_directories()
     setup_rsync()