Merge lp:~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next

[Chris MacNaughton]

Add ability to manage ceph OSD and Journal devices with storage hooks

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

charm_unit_test #17081 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

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

charm_lint_check #18334 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

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

charm_amulet_test #9098 ceph-osd-next for chris.macnaughton mp284445
    AMULET FAIL: amulet-test failed

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

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

[lp:~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks]

62. By Chris MacNaughton on 2016-01-29

finish hooks

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

charm_unit_test #17082 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

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

charm_lint_check #18335 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

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

charm_amulet_test #9099 ceph-osd-next for chris.macnaughton mp284445
    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/14697247/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9099/

[lp:~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks]

63. By Chris MacNaughton on 2016-02-01

update to get around storage behaviour

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

charm_lint_check #18448 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

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

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

charm_unit_test #17187 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

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

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

charm_amulet_test #9145 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

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

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

charm_unit_test #122 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/122/

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

charm_lint_check #136 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/136/

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

charm_amulet_test #21 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/21/

[James Page (james-page)]

Chris

I have reservations about the actions being implemented here; they overlap heavily with what juju storage should be doing and I'm not sure they are the right direction.

That said, the juju storage stuff looks great - does the ceph charm suffer from the 'new versions' problem for early unit lifecycle as well?

review: Needs Fixing

[lp:~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks]

64. By Chris MacNaughton on 2016-02-18

remove actions stuff

[Chris MacNaughton (chris.macnaughton)]

Didn't mean for the actions (incomplete) to be on here; you'll notice the mini hook, add-storage, that shims in support to make the hooks ok later since they will fire before the install hook.

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

charm_unit_test #740 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/740/

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

charm_lint_check #837 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/837/

[lp:~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks]

65. By Chris MacNaughton on 2016-02-18

Resolve conflict with get_devices

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

charm_unit_test #743 ceph-osd-next for chris.macnaughton mp284445
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/743/

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

charm_lint_check #841 ceph-osd-next for chris.macnaughton mp284445
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/841/

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

charm_amulet_test #336 ceph-osd-next for chris.macnaughton mp284445
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/336/

Unmerged revisions

65. By Chris MacNaughton on 2016-02-18

Resolve conflict with get_devices

64. By Chris MacNaughton on 2016-02-18

remove actions stuff

63. By Chris MacNaughton on 2016-02-01

update to get around storage behaviour

62. By Chris MacNaughton on 2016-01-29

finish hooks

61. By Chris MacNaughton on 2016-01-29

add storage hooks for OSD and Journal devices

=== added file 'hooks/add-storage'
--- hooks/add-storage	1970-01-01 00:00:00 +0000
+++ hooks/add-storage	2016-02-18 14:13:10 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+dpkg -l|grep python-apt || exit
+
+exec ./hooks/storage.real

=== modified file 'hooks/ceph_hooks.py'
--- hooks/ceph_hooks.py	2016-02-02 14:54:17 +0000
+++ hooks/ceph_hooks.py	2016-02-18 14:13:10 +0000
@@ -26,6 +26,8 @@
     UnregisteredHookError,
     service_name,
     status_set,
+    storage_get,
+    storage_list
 )
 from charmhelpers.core.host import (
     umount,
@@ -157,24 +159,26 @@
     prepare_disks_and_activate()
 
 
[e-mail]('storage.real')
 def prepare_disks_and_activate():
-    osd_journal = get_journal_devices()
-    check_overlap(osd_journal, set(get_devices()))
-    log("got journal devs: {}".format(osd_journal), level=DEBUG)
-    already_zapped = read_zapped_journals()
-    non_zapped = osd_journal - already_zapped
-    for journ in non_zapped:
-        ceph.maybe_zap_journal(journ)
-    write_zapped_journals(osd_journal)
+    if os.path.exists('/var/lib/ceph'):
+        osd_journal = get_journal_devices()
+        check_overlap(osd_journal, set(get_devices()))
+        log("got journal devs: {}".format(osd_journal), level=DEBUG)
+        already_zapped = read_zapped_journals()
+        non_zapped = osd_journal - already_zapped
+        for journ in non_zapped:
+            ceph.maybe_zap_journal(journ)
+        write_zapped_journals(osd_journal)
 
-    if ceph.is_bootstrapped():
-        log('ceph bootstrapped, rescanning disks')
-        emit_cephconf()
-        for dev in get_devices():
-            ceph.osdize(dev, config('osd-format'),
-                        osd_journal, config('osd-reformat'),
-                        config('ignore-device-errors'))
-        ceph.start_osds(get_devices())
+        if ceph.is_bootstrapped():
+            log('ceph bootstrapped, rescanning disks')
+            emit_cephconf()
+            for dev in get_devices():
+                ceph.osdize(dev, config('osd-format'),
+                            osd_journal, config('osd-reformat'),
+                            config('ignore-device-errors'))
+            ceph.start_osds(get_devices())
 
 
 def get_mon_hosts():
@@ -218,19 +222,29 @@
 
 def get_devices():
     if config('osd-devices'):
-        return [
+        devices = [
             os.path.realpath(path)
             for path in config('osd-devices').split(' ')]
     else:
-        return []
+        devices = []
+    # List storage instances for the 'osd-devices'
+    # store declared for this charm too, and add
+    # their block device paths to the list.
+    storage_ids = storage_list('osd-devices')
+    devices.extend((storage_get('location', s) for s in storage_ids))
+    return devices
 
 
 def get_journal_devices():
-    osd_journal = config('osd-journal')
-    if not osd_journal:
-        return set()
-    osd_journal = [l.strip() for l in config('osd-journal').split(' ')]
-    osd_journal = set(filter(os.path.exists, osd_journal))
+    if config('osd-journal'):
+        osd_journals = config('osd-journal').split(' ')
+    else:
+        osd_journals = []
+    storage_ids = storage_list('osd-journals')
+    osd_journals.extend((storage_get('location', s) for s in storage_ids))
+
+    osd_journals = [l.strip() for l in osd_journals]
+    osd_journal = set(filter(os.path.exists, osd_journals))
     return osd_journal
 
 

=== added symlink 'hooks/osd-devices-storage-attached'
=== target is u'add-storage'
=== added symlink 'hooks/osd-devices-storage-detached'
=== target is u'add-storage'
=== added symlink 'hooks/osd-journals-storage-attached'
=== target is u'add-storage'
=== added symlink 'hooks/osd-journals-storage-detached'
=== target is u'add-storage'
=== added symlink 'hooks/storage.real'
=== target is u'ceph_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-11-18 10:30:34 +0000
+++ metadata.yaml	2016-02-18 14:13:10 +0000
@@ -19,3 +19,12 @@
 requires:
   mon:
     interface: ceph-osd
+storage:
+  osd-devices:
+    type: block
+    multiple:
+      range: 0-
+  osd-journals:
+    type: block
+    multiple:
+      range: 0-