From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 28 Jun 2017 12:51:29 +0000 (-0400)
Subject: ceph-volume: systemd: move to directory
X-Git-Tag: ses5-milestone10~3^2~5^2~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fefadc8add3102f29eab5bf62cb3e658c070c9f0;p=ceph.git

ceph-volume: systemd: move to directory

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/systemd.py b/src/ceph-volume/ceph_volume/systemd.py
deleted file mode 100644
index a904d97cd733..000000000000
--- a/src/ceph-volume/ceph_volume/systemd.py
+++ /dev/null
@@ -1,77 +0,0 @@
-"""
-This file is used only by systemd units that are passing their instance suffix
-as arguments to this script so that it can parse the suffix into arguments that
-``ceph-volume <sub command>`` can consume
-"""
-
-import sys
-import logging
-from ceph_volume import log, process
-from ceph_volume.exceptions import SuffixParsingError
-
-
-log.setup(name='ceph-volume-systemd.log')
-logger = logging.getLogger('systemd')
-
-
-def parse_subcommand(string):
-    subcommand = string.rsplit('-', 1)[-1]
-    if not subcommand:
-        raise SuffixParsingError('subcommand', string)
-    return subcommand
-
-
-def parse_osd_id(string):
-    osd_id = string.split('-', 1)[0]
-    if not osd_id:
-        raise SuffixParsingError('OSD id', string)
-    return osd_id
-
-
-def parse_osd_uuid(string):
-    osd_id = '%s-' % parse_osd_id(string)
-    osd_subcommand = '-%s' % parse_subcommand(string)
-    # remove the id first
-    trimmed_suffix = string.split(osd_id)[-1]
-    # now remove the sub command
-    osd_uuid = trimmed_suffix.split(osd_subcommand)[0]
-    if not osd_uuid:
-        raise SuffixParsingError('OSD uuid', string)
-    return osd_uuid
-
-
-def main(args=None):
-    """
-    Main entry point for the ``ceph-volume-systemd`` executable. ``args`` are
-    optional for easier testing of arguments.
-
-    Expected input is similar to::
-
-        ['/path/to/ceph-volume-systemd', '<osd id>-<osd uuid>-<device type>']
-
-    For example::
-
-        [
-            '/usr/bin/ceph-volume-systemd',
-            '0-8715BEB4-15C5-49DE-BA6F-401086EC7B41-lvm'
-        ]
-
-    The last part of the argument is the only interesting bit, which contains
-    the metadata needed to proxy the call to ``ceph-volume`` itself.
-
-    Reusing the example, the proxy call to ``ceph-volume`` would look like::
-
-        ceph-volume lvm 0 8715BEB4-15C5-49DE-BA6F-401086EC7B41
-
-    """
-    args = args or sys.argv
-    suffix = args[-1]
-    sub_command = parse_subcommand(suffix)
-    osd_id = parse_osd_id(suffix)
-    osd_uuid = parse_osd_uuid(suffix)
-    logger.info('raw systemd input received: %s', suffix)
-    logger.info('osd id: %s, osd uuid: %s, sub-command: %s', osd_id, osd_uuid, sub_command)
-    command = ['ceph-volume', sub_command, 'activate', osd_id, osd_uuid]
-
-    # don't log any output to the terminal, just rely on stderr/stdout going to logging
-    process.run(command, terminal_logging=False)
diff --git a/src/ceph-volume/ceph_volume/systemd/main.py b/src/ceph-volume/ceph_volume/systemd/main.py
new file mode 100644
index 000000000000..a904d97cd733
--- /dev/null
+++ b/src/ceph-volume/ceph_volume/systemd/main.py
@@ -0,0 +1,77 @@
+"""
+This file is used only by systemd units that are passing their instance suffix
+as arguments to this script so that it can parse the suffix into arguments that
+``ceph-volume <sub command>`` can consume
+"""
+
+import sys
+import logging
+from ceph_volume import log, process
+from ceph_volume.exceptions import SuffixParsingError
+
+
+log.setup(name='ceph-volume-systemd.log')
+logger = logging.getLogger('systemd')
+
+
+def parse_subcommand(string):
+    subcommand = string.rsplit('-', 1)[-1]
+    if not subcommand:
+        raise SuffixParsingError('subcommand', string)
+    return subcommand
+
+
+def parse_osd_id(string):
+    osd_id = string.split('-', 1)[0]
+    if not osd_id:
+        raise SuffixParsingError('OSD id', string)
+    return osd_id
+
+
+def parse_osd_uuid(string):
+    osd_id = '%s-' % parse_osd_id(string)
+    osd_subcommand = '-%s' % parse_subcommand(string)
+    # remove the id first
+    trimmed_suffix = string.split(osd_id)[-1]
+    # now remove the sub command
+    osd_uuid = trimmed_suffix.split(osd_subcommand)[0]
+    if not osd_uuid:
+        raise SuffixParsingError('OSD uuid', string)
+    return osd_uuid
+
+
+def main(args=None):
+    """
+    Main entry point for the ``ceph-volume-systemd`` executable. ``args`` are
+    optional for easier testing of arguments.
+
+    Expected input is similar to::
+
+        ['/path/to/ceph-volume-systemd', '<osd id>-<osd uuid>-<device type>']
+
+    For example::
+
+        [
+            '/usr/bin/ceph-volume-systemd',
+            '0-8715BEB4-15C5-49DE-BA6F-401086EC7B41-lvm'
+        ]
+
+    The last part of the argument is the only interesting bit, which contains
+    the metadata needed to proxy the call to ``ceph-volume`` itself.
+
+    Reusing the example, the proxy call to ``ceph-volume`` would look like::
+
+        ceph-volume lvm 0 8715BEB4-15C5-49DE-BA6F-401086EC7B41
+
+    """
+    args = args or sys.argv
+    suffix = args[-1]
+    sub_command = parse_subcommand(suffix)
+    osd_id = parse_osd_id(suffix)
+    osd_uuid = parse_osd_uuid(suffix)
+    logger.info('raw systemd input received: %s', suffix)
+    logger.info('osd id: %s, osd uuid: %s, sub-command: %s', osd_id, osd_uuid, sub_command)
+    command = ['ceph-volume', sub_command, 'activate', osd_id, osd_uuid]
+
+    # don't log any output to the terminal, just rely on stderr/stdout going to logging
+    process.run(command, terminal_logging=False)