From 4405e4906ea91aad124a7e35f26f2950cecbf7db Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Wed, 4 Jan 2017 07:15:59 -0800 Subject: [PATCH] Adding Arch Linux support Signed-off-by: Jamin W. Collins --- src/ceph-detect-init/ceph_detect_init/__init__.py | 4 +++- .../ceph_detect_init/arch/__init__.py | 11 +++++++++++ src/ceph-detect-init/tests/test_all.py | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/ceph-detect-init/ceph_detect_init/arch/__init__.py diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py index b749ea08b5224..b431616cedfcb 100644 --- a/src/ceph-detect-init/ceph_detect_init/__init__.py +++ b/src/ceph-detect-init/ceph_detect_init/__init__.py @@ -14,6 +14,7 @@ # GNU Library Public License for more details. # from ceph_detect_init import alpine +from ceph_detect_init import arch from ceph_detect_init import centos from ceph_detect_init import debian from ceph_detect_init import exc @@ -55,6 +56,7 @@ def _get_distro(distro, use_rhceph=False): distro = _normalized_distro_name(distro) distributions = { 'alpine': alpine, + 'arch': arch, 'debian': debian, 'ubuntu': debian, 'linuxmint': debian, @@ -94,7 +96,7 @@ def platform_information(): """detect platform information from remote host.""" if platform.system() == 'Linux': linux_distro = platform.linux_distribution( - supported_dists=platform._supported_dists + ('alpine',)) + supported_dists=platform._supported_dists + ('alpine', 'arch')) logging.debug('platform_information: linux_distribution = ' + str(linux_distro)) distro, release, codename = linux_distro diff --git a/src/ceph-detect-init/ceph_detect_init/arch/__init__.py b/src/ceph-detect-init/ceph_detect_init/arch/__init__.py new file mode 100644 index 0000000000000..425ce50bb2f7e --- /dev/null +++ b/src/ceph-detect-init/ceph_detect_init/arch/__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 'systemd' diff --git a/src/ceph-detect-init/tests/test_all.py b/src/ceph-detect-init/tests/test_all.py index d83f7b5fdfea2..a81ec980843af 100644 --- a/src/ceph-detect-init/tests/test_all.py +++ b/src/ceph-detect-init/tests/test_all.py @@ -24,6 +24,7 @@ import ceph_detect_init from ceph_detect_init import alpine +from ceph_detect_init import arch from ceph_detect_init import centos from ceph_detect_init import debian from ceph_detect_init import exc @@ -43,6 +44,9 @@ class TestCephDetectInit(testtools.TestCase): def test_alpine(self): self.assertEqual('openrc', alpine.choose_init()) + def test_arch(self): + self.assertEqual('systemd', arch.choose_init()) + def test_freebsd(self): self.assertEqual('bsdrc', freebsd.choose_init())