Merge lp:~gnuoy/charms/trusty/ceph-osd/stable-charmhelper-sync into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/trunk

[Liam Young]

[Chris Glass (tribaal)]

Looks good! +1 (would merge)

review: Approve

[David Britton (dpb)]

Tested on MAAS, installed great, +1.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-10-08 14:07:16 +0000
+++ .bzrignore	2014-09-26 09:09:07 +0000
@@ -1,1 +1,2 @@
 .project
+bin

=== modified file 'Makefile'
--- Makefile	2014-05-21 11:55:52 +0000
+++ Makefile	2014-09-26 09:09:07 +0000
@@ -1,11 +1,17 @@
 #!/usr/bin/make
+PYTHON := /usr/bin/env python
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
 	@charm proof || true
 
-sync:
-	@charm-helper-sync -c charm-helpers-sync.yaml
+bin/charm_helpers_sync.py:
+	@mkdir -p bin
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
+        > bin/charm_helpers_sync.py
+
+sync: bin/charm_helpers_sync.py
+	$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml
 
 publish: lint
 	bzr push lp:charms/ceph-osd

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2014-05-19 12:16:15 +0000
+++ hooks/ceph.py	2014-09-26 09:09:07 +0000
@@ -11,10 +11,10 @@
 import subprocess
 import time
 import os
-import apt_pkg as apt
 from charmhelpers.core.host import (
     mkdir,
     service_restart,
+    cmp_pkgrevno
 )
 from charmhelpers.core.hookenv import (
     log,
@@ -126,7 +126,7 @@
 def start_osds(devices):
     # Scan for ceph block devices
     rescan_osd_devices()
-    if get_ceph_version() >= "0.56.6":
+    if cmp_pkgrevno('ceph', '0.56.6') >= 0:
         # Use ceph-disk-activate for directory based OSD's
         for dev_or_path in devices:
             if os.path.exists(dev_or_path) and os.path.isdir(dev_or_path):
@@ -296,20 +296,6 @@
             os.unlink(keyring)
 
 
-def get_ceph_version():
-    apt.init()
-    cache = apt.Cache()
-    pkg = cache['ceph']
-    if pkg.current_ver:
-        return apt.upstream_version(pkg.current_ver.ver_str)
-    else:
-        return None
-
-
-def version_compare(a, b):
-    return apt.version_compare(a, b)
-
-
 def update_monfs():
     hostname = get_unit_hostname()
     monfs = '/var/lib/ceph/mon/ceph-{}'.format(hostname)
@@ -347,7 +333,7 @@
 
     cmd = ['ceph-disk-prepare']
     # Later versions of ceph support more options
-    if get_ceph_version() >= "0.48.3":
+    if cmp_pkgrevno('ceph', '0.48.3') >= 0:
         if osd_format:
             cmd.append('--fs-type')
             cmd.append(osd_format)
@@ -370,7 +356,7 @@
         log('Path {} is already configured as an OSD - bailing'.format(path))
         return
 
-    if get_ceph_version() < "0.56.6":
+    if cmp_pkgrevno('ceph', '0.56.6.') < 0:
         log('Unable to use directories for OSDs with ceph < 0.56.6',
             level=ERROR)
         raise

=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2014-05-19 11:39:52 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2014-09-26 09:09:07 +0000
@@ -37,6 +37,7 @@
     check_call(['dd', 'if=/dev/zero', 'of=%s' % (block_device),
                 'bs=512', 'count=100', 'seek=%s' % (gpt_end)])
 
+
 def is_device_mounted(device):
     '''Given a device path, return True if that device is mounted, and False
     if it isn't.
@@ -45,5 +46,8 @@
     :returns: boolean: True if the path represents a mounted device, False if
         it doesn't.
     '''
+    is_partition = bool(re.search(r".*[0-9]+\b", device))
     out = check_output(['mount'])
+    if is_partition:
+        return bool(re.search(device + r"\b", out))
     return bool(re.search(device + r"[0-9]+\b", out))

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2014-07-24 10:00:02 +0000
+++ hooks/charmhelpers/core/host.py	2014-09-26 09:09:07 +0000
@@ -318,12 +318,8 @@
        0 => Installed revno is the same as supplied arg
       -1 => Installed revno is less than supplied arg
     '''
+    from charmhelpers.fetch import apt_cache
     if not pkgcache:
-        apt_pkg.init()
-        # Force Apt to build its cache in memory. That way we avoid race
-        # conditions with other applications building the cache in the same
-        # place.
-        apt_pkg.config.set("Dir::Cache::pkgcache", "")
-        pkgcache = apt_pkg.Cache()
+        pkgcache = apt_cache()
     pkg = pkgcache[package]
     return apt_pkg.version_compare(pkg.current_ver.ver_str, revno)

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2014-05-19 11:39:52 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2014-09-26 09:09:07 +0000
@@ -108,13 +108,8 @@
 
 def filter_installed_packages(packages):
     """Returns a list of packages that require installation"""
-    apt_pkg.init()
-
-    # Tell apt to build an in-memory cache to prevent race conditions (if
-    # another process is already building the cache).
-    apt_pkg.config.set("Dir::Cache::pkgcache", "")
-
-    cache = apt_pkg.Cache()
+
+    cache = apt_cache()
     _pkgs = []
     for package in packages:
         try:
@@ -127,6 +122,15 @@
     return _pkgs
 
 
+def apt_cache(in_memory=True):
+    """Build and return an apt cache"""
+    apt_pkg.init()
+    if in_memory:
+        apt_pkg.config.set("Dir::Cache::pkgcache", "")
+        apt_pkg.config.set("Dir::Cache::srcpkgcache", "")
+    return apt_pkg.Cache()
+
+
 def apt_install(packages, options=None, fatal=False):
     """Install one or more packages"""
     if options is None:

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-03-25 18:44:23 +0000
+++ hooks/hooks.py	2014-09-26 09:09:07 +0000
@@ -26,7 +26,8 @@
 )
 from charmhelpers.core.host import (
     umount,
-    mkdir
+    mkdir,
+    cmp_pkgrevno
 )
 from charmhelpers.fetch import (
     add_source,
@@ -47,7 +48,7 @@
 
 def install_upstart_scripts():
     # Only install upstart configurations for older versions
-    if ceph.get_ceph_version() < "0.55.1":
+    if cmp_pkgrevno('ceph', "0.55.1") < 0:
         for x in glob.glob('files/upstart/*.conf'):
             shutil.copy(x, '/etc/init/')
 
@@ -70,7 +71,7 @@
         'auth_supported': get_auth(),
         'mon_hosts': ' '.join(mon_hosts),
         'fsid': get_fsid(),
-        'version': ceph.get_ceph_version(),
+        'old_auth': cmp_pkgrevno('ceph', "0.51") < 0,
         'osd_journal_size': config('osd-journal-size'),
         'use_syslog': str(config('use-syslog')).lower()
     }

=== modified file 'templates/ceph.conf'
--- templates/ceph.conf	2014-03-25 18:44:23 +0000
+++ templates/ceph.conf	2014-09-26 09:09:07 +0000
@@ -1,5 +1,5 @@
 [global]
-{% if version < "0.51" %}
+{% if old_auth %}
  auth supported = {{ auth_supported }}
 {% else %}
  auth cluster required = {{ auth_supported }}