]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_detect_init: Add support for Alpine 8316/head
authorJohn Coyle <dx9err@gmail.com>
Fri, 10 Jun 2016 02:34:09 +0000 (22:34 -0400)
committerJohn Coyle <dx9err@gmail.com>
Wed, 7 Sep 2016 22:55:13 +0000 (18:55 -0400)
Signed-off-by: John Coyle <dx9err@gmail.com>
src/ceph-detect-init/ceph_detect_init/__init__.py
src/ceph-detect-init/ceph_detect_init/alpine/__init__.py [new file with mode: 0644]
src/ceph-detect-init/integration/alpine-3.4.dockerfile [new file with mode: 0644]
src/ceph-detect-init/integration/test_main.py
src/ceph-detect-init/tests/test_all.py

index 71e31bb485403c7d70775637ba274cc38d7afcf3..561900d2f33f93d570a27b6ecd475f527f36cb29 100644 (file)
@@ -13,6 +13,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+from ceph_detect_init import alpine
 from ceph_detect_init import centos
 from ceph_detect_init import debian
 from ceph_detect_init import exc
@@ -52,6 +53,7 @@ def _get_distro(distro, use_rhceph=False):
 
     distro = _normalized_distro_name(distro)
     distributions = {
+        'alpine': alpine,
         'debian': debian,
         'ubuntu': debian,
         'linuxmint': debian,
diff --git a/src/ceph-detect-init/ceph_detect_init/alpine/__init__.py b/src/ceph-detect-init/ceph_detect_init/alpine/__init__.py
new file mode 100644 (file)
index 0000000..b05bd9e
--- /dev/null
@@ -0,0 +1,11 @@
+distro = None
+release = None
+codename = None
+
+
+def choose_init():
+    """Select a init system
+
+     Returns the name of a init system (upstart, sysvinit ...).
+     """
+    return 'openrc'
diff --git a/src/ceph-detect-init/integration/alpine-3.4.dockerfile b/src/ceph-detect-init/integration/alpine-3.4.dockerfile
new file mode 100644 (file)
index 0000000..caa357a
--- /dev/null
@@ -0,0 +1,3 @@
+FROM alpine:3.4
+
+RUN apk --update add --no-cache py-pip py-virtualenv git bash
index c24d1c8b557b6bf4d67680d99392dee1f61eb035..c5b6a20e5ecc11d22086288c4318f04a83532fdd 100644 (file)
@@ -53,6 +53,9 @@ docker run -v $toplevel:$toplevel -w $(pwd) --user $(id -u) {name} bash -x {name
 
 class TestCephDetectInit(testtools.TestCase):
 
+    def test_alpine_3_4(self):
+        self.assertEqual('openrc', run('alpine-3.4'))
+
     def test_centos_6(self):
         self.assertEqual('sysvinit', run('centos-6'))
 
index a33b3251b4b5f28e227248755e867c780dd61738..d0d4e06c2eb199085b67770c64e2a76fb565c4c7 100644 (file)
@@ -23,6 +23,7 @@ import mock
 import testtools
 
 import ceph_detect_init
+from ceph_detect_init import alpine
 from ceph_detect_init import centos
 from ceph_detect_init import debian
 from ceph_detect_init import exc
@@ -38,6 +39,9 @@ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s',
 
 class TestCephDetectInit(testtools.TestCase):
 
+    def test_alpine(self):
+        self.assertEqual('openrc', alpine.choose_init())
+
     def test_centos(self):
         with mock.patch('ceph_detect_init.centos.release',
                         '7.0'):