Merge lp:~xfactor973/charms/trusty/ceph/bug_1513009 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Chris Holcombe]

This change handles the case of LVM PV disks being handed to Ceph. Basically this is a 3 liner + pulling in the LVM code from charmhelpers.

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

charm_unit_test #124 ceph-next for xfactor973 mp284989
    UNIT OK: passed

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

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

charm_lint_check #134 ceph-next for xfactor973 mp284989
    LINT OK: passed

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

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

charm_amulet_test #19 ceph-next for xfactor973 mp284989
    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/15003597/
Build: http://10.245.162.36:8080/job/charm_amulet_test/19/

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

charm_amulet_test #32 ceph-next for xfactor973 mp284989
    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/15009723/
Build: http://10.245.162.36:8080/job/charm_amulet_test/32/

[James Page (james-page)]

Re-running amulet tests...

[James Page (james-page)]

Check needs to go a bit deeper - see inline comment

review: Needs Fixing

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

charm_amulet_test #95 ceph-next for xfactor973 mp284989
    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/15016032/
Build: http://10.245.162.36:8080/job/charm_amulet_test/95/

Unmerged revisions

126. By Chris Holcombe on 2016-02-03

Merge upstream

125. By Chris Holcombe on 2015-12-16

Check for lvm pvs

=== modified file '.bzrignore'
--- .bzrignore	2015-11-02 22:07:46 +0000
+++ .bzrignore	2016-02-03 23:05:33 +0000
@@ -1,4 +1,5 @@
 bin
+.idea
 .coverage
 .testrepository
 .tox
 
=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2016-01-11 15:18:55 +0000
+++ charm-helpers-hooks.yaml	2016-02-03 23:05:33 +0000
@@ -6,6 +6,7 @@
     - fetch
     - contrib.storage.linux:
         - utils
+        - lvm
         - ceph
     - payload.execd
     - contrib.openstack.alternatives
 
=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2016-01-12 14:17:36 +0000
+++ hooks/ceph.py	2016-02-03 23:05:33 +0000
@@ -1,4 +1,3 @@
-
 #
 # Copyright 2012 Canonical Ltd.
 #
@@ -27,6 +26,7 @@
     cached,
     status_set,
 )
+from charmhelpers.contrib.storage.linux.lvm import is_lvm_physical_volume
 from charmhelpers.fetch import (
     apt_cache
 )
@@ -54,7 +54,7 @@
 
 
 def get_version():
-    '''Derive Ceph release from an installed package.'''
+    """Derive Ceph release from an installed package."""
     import apt_pkg as apt
 
     cache = apt_cache()
@@ -63,7 +63,7 @@
         pkg = cache[package]
     except:
         # the package is unknown to the current apt cache.
-        e = 'Could not determine version of package with no installation '\
+        e = 'Could not determine version of package with no installation ' \
             'candidate: %s' % package
         error_out(e)
 
@@ -164,6 +164,7 @@
         # Ignore any errors for this call
         subprocess.call(cmd)
 
+
 DISK_FORMATS = [
     'xfs',
     'ext4',
@@ -177,7 +178,7 @@
         info = info.split("\n")  # IGNORE:E1103
         for line in info:
             if line.startswith(
-                'Partition GUID code: 4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D'
+                    'Partition GUID code: 4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D'
             ):
                 return True
     except subprocess.CalledProcessError:
@@ -422,11 +423,16 @@
         log('Path {} does not exist - bailing'.format(dev))
         return
 
+    if is_lvm_physical_volume(dev):
+        log('Path {} is an lvm physical volume. Please pass the lvm logical '
+            'volume instead - bailing'.format(dev))
+        return
+
     if not is_block_device(dev):
         log('Path {} is not a block device - bailing'.format(dev))
         return
 
-    if (is_osd_disk(dev) and not reformat_osd):
+    if is_osd_disk(dev) and not reformat_osd:
         log('Looks like {} is already an OSD, skipping.'.format(dev))
         return
 
 
=== added file 'hooks/charmhelpers/contrib/storage/linux/lvm.py'
--- hooks/charmhelpers/contrib/storage/linux/lvm.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/storage/linux/lvm.py	2016-02-03 23:05:33 +0000
@@ -0,0 +1,105 @@
+# Copyright 2014-2015 Canonical Limited.
+#
+# This file is part of charm-helpers.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+from subprocess import (
+    CalledProcessError,
+    check_call,
+    check_output,
+    Popen,
+    PIPE,
+)
+
+
+##################################################
+# LVM helpers.
+##################################################
+def deactivate_lvm_volume_group(block_device):
+    '''
+    Deactivate any volume gruop associated with an LVM physical volume.
+
+    :param block_device: str: Full path to LVM physical volume
+    '''
+    vg = list_lvm_volume_group(block_device)
+    if vg:
+        cmd = ['vgchange', '-an', vg]
+        check_call(cmd)
+
+
+def is_lvm_physical_volume(block_device):
+    '''
+    Determine whether a block device is initialized as an LVM PV.
+
+    :param block_device: str: Full path of block device to inspect.
+
+    :returns: boolean: True if block device is a PV, False if not.
+    '''
+    try:
+        check_output(['pvdisplay', block_device])
+        return True
+    except CalledProcessError:
+        return False
+
+
+def remove_lvm_physical_volume(block_device):
+    '''
+    Remove LVM PV signatures from a given block device.
+
+    :param block_device: str: Full path of block device to scrub.
+    '''
+    p = Popen(['pvremove', '-ff', block_device],
+              stdin=PIPE)
+    p.communicate(input='y\n')
+
+
+def list_lvm_volume_group(block_device):
+    '''
+    List LVM volume group associated with a given block device.
+
+    Assumes block device is a valid LVM PV.
+
+    :param block_device: str: Full path of block device to inspect.
+
+    :returns: str: Name of volume group associated with block device or None
+    '''
+    vg = None
+    pvd = check_output(['pvdisplay', block_device]).splitlines()
+    for l in pvd:
+        l = l.decode('UTF-8')
+        if l.strip().startswith('VG Name'):
+            vg = ' '.join(l.strip().split()[2:])
+    return vg
+
+
+def create_lvm_physical_volume(block_device):
+    '''
+    Initialize a block device as an LVM physical volume.
+
+    :param block_device: str: Full path of block device to initialize.
+
+    '''
+    check_call(['pvcreate', block_device])
+
+
+def create_lvm_volume_group(volume_group, block_device):
+    '''
+    Create an LVM volume group backed by a given block device.
+
+    Assumes block device has already been initialized as an LVM PV.
+
+    :param volume_group: str: Name of volume group to create.
+    :block_device: str: Full path of PV-initialized block device.
+    '''
+    check_call(['vgcreate', volume_group, block_device])