From: John Coyle Date: Fri, 10 Jun 2016 02:34:09 +0000 (-0400) Subject: ceph_detect_init: Add support for Alpine X-Git-Tag: v11.1.0~570^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=693528d20e6d9aa73da6c5d44674fc65acc7206a;p=ceph.git ceph_detect_init: Add support for Alpine Signed-off-by: John Coyle --- diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py index 71e31bb48540..561900d2f33f 100644 --- a/src/ceph-detect-init/ceph_detect_init/__init__.py +++ b/src/ceph-detect-init/ceph_detect_init/__init__.py @@ -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 index 000000000000..b05bd9ef293d --- /dev/null +++ b/src/ceph-detect-init/ceph_detect_init/alpine/__init__.py @@ -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 index 000000000000..caa357abcb3c --- /dev/null +++ b/src/ceph-detect-init/integration/alpine-3.4.dockerfile @@ -0,0 +1,3 @@ +FROM alpine:3.4 + +RUN apk --update add --no-cache py-pip py-virtualenv git bash diff --git a/src/ceph-detect-init/integration/test_main.py b/src/ceph-detect-init/integration/test_main.py index c24d1c8b557b..c5b6a20e5ecc 100644 --- a/src/ceph-detect-init/integration/test_main.py +++ b/src/ceph-detect-init/integration/test_main.py @@ -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')) diff --git a/src/ceph-detect-init/tests/test_all.py b/src/ceph-detect-init/tests/test_all.py index a33b3251b4b5..d0d4e06c2eb1 100644 --- a/src/ceph-detect-init/tests/test_all.py +++ b/src/ceph-detect-init/tests/test_all.py @@ -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'):