Merge lp:~1chb1n/charms/trusty/cinder/next.ephem-key-error into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Ryan Beisner]

Resolves config-changed hook fail (http://paste.ubuntu.com/11997864/) on key error for ephemeral-unmount, when that option is not defined.

Uses the config() method instead of the resultant conf dict, as is done in ceph (http://bazaar.launchpad.net/~openstack-charmers/charms/trusty/ceph/next/view/head:/hooks/hooks.py#L142).

unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 Traceback (most recent call last):
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 File "/var/lib/juju/agents/unit-cinder-0/charm/hooks/config-changed", line 536, in <module>
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 hooks.execute(sys.argv)
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 File "/var/lib/juju/agents/unit-cinder-0/charm/hooks/charmhelpers/core/hookenv.py", line 691, in execute
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 self._hooks[hook_name]()
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 File "/var/lib/juju/agents/unit-cinder-0/charm/hooks/charmhelpers/core/host.py", line 356, in wrapped_f
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 f(*args, **kwargs)
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 File "/var/lib/juju/agents/unit-cinder-0/charm/hooks/config-changed", line 131, in config_changed
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 e_mountpoint = conf['ephemeral-unmount']
unit-cinder-0[12088]: 2015-08-04 03:28:32 INFO unit.cinder/0.config-changed logger.go:40 KeyError: 'ephemeral-unmount'
unit-cinder-0[12088]: 2015-08-04 03:28:32 ERROR juju.worker.uniter.operation runhook.go:103 hook "config-changed" failed: exit status 1

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

charm_lint_check #7513 cinder-next for 1chb1n mp266826
    LINT OK: passed

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

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

charm_unit_test #6968 cinder-next for 1chb1n mp266826
    UNIT OK: passed

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

[James Page (james-page)]

review: Approve

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

charm_amulet_test #5609 cinder-next for 1chb1n mp266826
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-08-03 20:18:39 +0000
+++ hooks/cinder_hooks.py	2015-08-04 03:33:36 +0000
@@ -125,7 +125,7 @@
         sync_db_with_multi_ipv6_addresses(config('database'),
                                           config('database-user'))
 
-    e_mountpoint = conf['ephemeral-unmount']
+    e_mountpoint = config('ephemeral-unmount')
     if e_mountpoint and filesystem_mounted(e_mountpoint):
         umount(e_mountpoint)