[chris.macnaughton, r=cholcombe] Add support for Ceph Infernalis release

README.md

@@ -91,7 +91,7 @@ hook to wait for all three nodes to come up, and then write their addresses
 to ceph.conf in the "mon host" parameter. After we initialize the monitor
 cluster a quorum forms quickly, and OSD bringup proceeds.
 
-The osds use so-called "OSD hotplugging". **ceph-disk-prepare** is used to
+The osds use so-called "OSD hotplugging". **ceph-disk prepare** is used to
 create the filesystems with a special GPT partition type. *udev* is set up
 to mount such filesystems and start the osd daemons as their storage becomes
 visible to the system (or after `udevadm trigger`).

files/upstart/ceph-hotplug.conf

@@ -8,4 +8,4 @@ stop on runlevel [!2345]
 task
 instance $DEVNAME
 
-exec /usr/sbin/ceph-disk-activate --mount -- "$DEVNAME"
+exec /usr/sbin/ceph-disk activate --mount -- "$DEVNAME"

hooks/ceph.py

@@ -11,8 +11,11 @@ import json
 import subprocess
 import time
 import os
+import re
+import sys
 from charmhelpers.core.host import (
     mkdir,
+    chownr,
     service_restart,
     cmp_pkgrevno,
     lsb_release
@@ -24,6 +27,9 @@ from charmhelpers.core.hookenv import (
     cached,
     status_set,
 )
+from charmhelpers.fetch import (
+    apt_cache
+)
 from charmhelpers.contrib.storage.linux.utils import (
     zap_disk,
     is_block_device,
@@ -40,9 +46,55 @@ QUORUM = [LEADER, PEON]
 PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'python-ceph', 'xfsprogs']
 
 
+def ceph_user():
+    if get_version() > 1:
+        return 'ceph'
+    else:
+        return "root"
+
+
+def get_version():
+    '''Derive Ceph release from an installed package.'''
+    import apt_pkg as apt
+
+    cache = apt_cache()
+    package = "ceph"
+    try:
+        pkg = cache[package]
+    except:
+        # the package is unknown to the current apt cache.
+        e = 'Could not determine version of package with no installation '\
+            'candidate: %s' % package
+        error_out(e)
+
+    if not pkg.current_ver:
+        # package is known, but no version is currently installed.
+        e = 'Could not determine version of uninstalled package: %s' % package
+        error_out(e)
+
+    vers = apt.upstream_version(pkg.current_ver.ver_str)
+
+    # x.y match only for 20XX.X
+    # and ignore patch level for other packages
+    match = re.match('^(\d+)\.(\d+)', vers)
+
+    if match:
+        vers = match.group(0)
+    return float(vers)
+
+
+def error_out(msg):
+    log("FATAL ERROR: %s" % msg,
+        level=ERROR)
+    sys.exit(1)
+
+
 def is_quorum():
     asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
     cmd = [
+        "sudo",
+        "-u",
+        ceph_user(),
         "ceph",
         "--admin-daemon",
         asok,
@@ -67,6 +119,9 @@ def is_quorum():
 def is_leader():
     asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
     cmd = [
+        "sudo",
+        "-u",
+        ceph_user(),
         "ceph",
         "--admin-daemon",
         asok,
@@ -96,6 +151,9 @@ def wait_for_quorum():
 def add_bootstrap_hint(peer):
     asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
     cmd = [
+        "sudo",
+        "-u",
+        ceph_user(),
         "ceph",
         "--admin-daemon",
         asok,
@@ -131,10 +189,10 @@ def start_osds(devices):
     # Scan for ceph block devices
     rescan_osd_devices()
     if cmp_pkgrevno('ceph', "0.56.6") >= 0:
-        # Use ceph-disk-activate for directory based OSD's
+        # 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):
-                subprocess.check_call(['ceph-disk-activate', dev_or_path])
+                subprocess.check_call(['ceph-disk', 'activate', dev_or_path])
 
 
 def rescan_osd_devices():
@@ -161,6 +219,9 @@ def wait_for_bootstrap():
 def import_osd_bootstrap_key(key):
     if not os.path.exists(_bootstrap_keyring):
         cmd = [
+            "sudo",
+            "-u",
+            ceph_user(),
             'ceph-authtool',
             _bootstrap_keyring,
             '--create-keyring',
@@ -219,6 +280,9 @@ _radosgw_keyring = "/etc/ceph/keyring.rados.gateway"
 def import_radosgw_key(key):
     if not os.path.exists(_radosgw_keyring):
         cmd = [
+            "sudo",
+            "-u",
+            ceph_user(),
             'ceph-authtool',
             _radosgw_keyring,
             '--create-keyring',
@@ -247,6 +311,9 @@ _default_caps = {
 def get_named_key(name, caps=None):
     caps = caps or _default_caps
     cmd = [
+        "sudo",
+        "-u",
+        ceph_user(),
         'ceph',
         '--name', 'mon.',
         '--keyring',
@@ -270,7 +337,7 @@ def upgrade_key_caps(key, caps):
         # Not the MON leader OR not clustered
         return
     cmd = [
-        'ceph', 'auth', 'caps', key
+        "sudo", "-u", ceph_user(), 'ceph', 'auth', 'caps', key
     ]
     for subsystem, subcaps in caps.iteritems():
         cmd.extend([subsystem, '; '.join(subcaps)])
@@ -297,8 +364,9 @@ def bootstrap_monitor_cluster(secret):
         log('bootstrap_monitor_cluster: mon already initialized.')
     else:
         # Ceph >= 0.61.3 needs this for ceph-mon fs creation
-        mkdir('/var/run/ceph', perms=0o755)
-        mkdir(path)
+        mkdir('/var/run/ceph', owner=ceph_user(),
+              group=ceph_user(), perms=0o755)
+        mkdir(path, owner=ceph_user(), group=ceph_user())
         # end changes for Ceph >= 0.61.3
         try:
             subprocess.check_call(['ceph-authtool', keyring,
@@ -309,7 +377,7 @@ def bootstrap_monitor_cluster(secret):
             subprocess.check_call(['ceph-mon', '--mkfs',
                                    '-i', hostname,
                                    '--keyring', keyring])
-
+            chownr(path, ceph_user(), ceph_user())
             with open(done, 'w'):
                 pass
             with open(init_marker, 'w'):
@@ -367,7 +435,7 @@ def osdize_dev(dev, osd_format, osd_journal, reformat_osd=False,
         return
 
     status_set('maintenance', 'Initializing device {}'.format(dev))
-    cmd = ['ceph-disk-prepare']
+    cmd = ['ceph-disk', 'prepare']
     # Later versions of ceph support more options
     if cmp_pkgrevno('ceph', '0.48.3') >= 0:
         if osd_format:
@@ -405,9 +473,12 @@ def osdize_dir(path):
             level=ERROR)
         raise
 
-    mkdir(path)
+    mkdir(path, owner=ceph_user(), group=ceph_user(), perms=0o755)
+    chownr('/var/lib/ceph', ceph_user(), ceph_user())
     cmd = [
-        'ceph-disk-prepare',
+        'sudo', '-u', ceph_user(),
+        'ceph-disk',
+        'prepare',
         '--data-dir',
         path
     ]

hooks/ceph_hooks.py

@@ -111,7 +111,8 @@ def emit_cephconf():
     # Install ceph.conf as an alternative to support
     # co-existence with other charms that write this file
     charm_ceph_conf = "/var/lib/charm/{}/ceph.conf".format(service_name())
-    mkdir(os.path.dirname(charm_ceph_conf))
+    mkdir(os.path.dirname(charm_ceph_conf), owner=ceph.ceph_user(),
+          group=ceph.ceph_user())
     render('ceph.conf', charm_ceph_conf, cephcontext, perms=0o644)
     install_alternative('ceph.conf', '/etc/ceph/ceph.conf',
                         charm_ceph_conf, 100)

hooks/charmhelpers/core/host.py

@@ -72,7 +72,9 @@ def service_pause(service_name, init_dir="/etc/init", initd_dir="/etc/init.d"):
         stopped = service_stop(service_name)
     upstart_file = os.path.join(init_dir, "{}.conf".format(service_name))
     sysv_file = os.path.join(initd_dir, service_name)
-    if os.path.exists(upstart_file):
+    if init_is_systemd():
+        service('disable', service_name)
+    elif os.path.exists(upstart_file):
         override_path = os.path.join(
             init_dir, '{}.override'.format(service_name))
         with open(override_path, 'w') as fh:
@@ -80,9 +82,9 @@ def service_pause(service_name, init_dir="/etc/init", initd_dir="/etc/init.d"):
     elif os.path.exists(sysv_file):
         subprocess.check_call(["update-rc.d", service_name, "disable"])
     else:
-        # XXX: Support SystemD too
         raise ValueError(
-            "Unable to detect {0} as either Upstart {1} or SysV {2}".format(
+            "Unable to detect {0} as SystemD, Upstart {1} or"
+            " SysV {2}".format(
                 service_name, upstart_file, sysv_file))
     return stopped
 
@@ -94,7 +96,9 @@ def service_resume(service_name, init_dir="/etc/init",
     Reenable starting again at boot. Start the service"""
     upstart_file = os.path.join(init_dir, "{}.conf".format(service_name))
     sysv_file = os.path.join(initd_dir, service_name)
-    if os.path.exists(upstart_file):
+    if init_is_systemd():
+        service('enable', service_name)
+    elif os.path.exists(upstart_file):
         override_path = os.path.join(
             init_dir, '{}.override'.format(service_name))
         if os.path.exists(override_path):
@@ -102,9 +106,9 @@ def service_resume(service_name, init_dir="/etc/init",
     elif os.path.exists(sysv_file):
         subprocess.check_call(["update-rc.d", service_name, "enable"])
     else:
-        # XXX: Support SystemD too
         raise ValueError(
-            "Unable to detect {0} as either Upstart {1} or SysV {2}".format(
+            "Unable to detect {0} as SystemD, Upstart {1} or"
+            " SysV {2}".format(
                 service_name, upstart_file, sysv_file))
 
     started = service_running(service_name)
@@ -115,23 +119,29 @@ def service_resume(service_name, init_dir="/etc/init",
 
 def service(action, service_name):
     """Control a system service"""
-    cmd = ['service', service_name, action]
+    if init_is_systemd():
+        cmd = ['systemctl', action, service_name]
+    else:
+        cmd = ['service', service_name, action]
     return subprocess.call(cmd) == 0
 
 
-def service_running(service):
+def service_running(service_name):
     """Determine whether a system service is running"""
-    try:
-        output = subprocess.check_output(
-            ['service', service, 'status'],
-            stderr=subprocess.STDOUT).decode('UTF-8')
-    except subprocess.CalledProcessError:
-        return False
+    if init_is_systemd():
+        return service('is-active', service_name)
     else:
-        if ("start/running" in output or "is running" in output):
-            return True
-        else:
+        try:
+            output = subprocess.check_output(
+                ['service', service_name, 'status'],
+                stderr=subprocess.STDOUT).decode('UTF-8')
+        except subprocess.CalledProcessError:
             return False
+        else:
+            if ("start/running" in output or "is running" in output):
+                return True
+            else:
+                return False
 
 
 def service_available(service_name):
@@ -146,6 +156,13 @@ def service_available(service_name):
         return True
 
 
+SYSTEMD_SYSTEM = '/run/systemd/system'
+
+
+def init_is_systemd():
+    return os.path.isdir(SYSTEMD_SYSTEM)
+
+
 def adduser(username, password=None, shell='/bin/bash', system_user=False,
             primary_group=None, secondary_groups=None):
     """

hooks/charmhelpers/fetch/giturl.py

@@ -22,7 +22,6 @@ from charmhelpers.fetch import (
     filter_installed_packages,
     apt_install,
 )
-from charmhelpers.core.host import mkdir
 
 if filter_installed_packages(['git']) != []:
     apt_install(['git'])
@@ -50,8 +49,8 @@ class GitUrlFetchHandler(BaseFetchHandler):
             cmd = ['git', '-C', dest, 'pull', source, branch]
         else:
             cmd = ['git', 'clone', source, dest, '--branch', branch]
-        if depth:
-            cmd.extend(['--depth', depth])
+            if depth:
+                cmd.extend(['--depth', depth])
         check_call(cmd)
 
     def install(self, source, branch="master", dest=None, depth=None):
@@ -62,8 +61,6 @@ class GitUrlFetchHandler(BaseFetchHandler):
         else:
             dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",
                                     branch_name)
-        if not os.path.exists(dest_dir):
-            mkdir(dest_dir, perms=0o755)
         try:
             self.clone(source, dest_dir, branch, depth)
         except OSError as e: