From 7e2d084eabbabd035e56a65c52b277a0732b09d5 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 23 Jan 2014 16:51:49 -0600 Subject: Initial add Gentoo distro --- sysvinit/gentoo/cloud-config | 14 ++++++++++++++ sysvinit/gentoo/cloud-final | 11 +++++++++++ sysvinit/gentoo/cloud-init | 12 ++++++++++++ sysvinit/gentoo/cloud-init-local | 13 +++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 sysvinit/gentoo/cloud-config create mode 100644 sysvinit/gentoo/cloud-final create mode 100644 sysvinit/gentoo/cloud-init create mode 100644 sysvinit/gentoo/cloud-init-local (limited to 'sysvinit') diff --git a/sysvinit/gentoo/cloud-config b/sysvinit/gentoo/cloud-config new file mode 100644 index 00000000..affd0cb3 --- /dev/null +++ b/sysvinit/gentoo/cloud-config @@ -0,0 +1,14 @@ +#!/sbin/runscript + +depend() { + after net # remove after nova-agent fix + before cloud-init-local + before cloud-init + before cloud-final + provide cloud-config +} + +start() { + cloud-init modules --mode config + eend 0 +} diff --git a/sysvinit/gentoo/cloud-final b/sysvinit/gentoo/cloud-final new file mode 100644 index 00000000..140c0f8e --- /dev/null +++ b/sysvinit/gentoo/cloud-final @@ -0,0 +1,11 @@ +#!/sbin/runscript +# add depends for network, dns, fs etc +depend() { + after cloud-init + provide cloud-final +} + +start() { + cloud-init modules --mode final + eend 0 +} diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init new file mode 100644 index 00000000..6f3ff8ed --- /dev/null +++ b/sysvinit/gentoo/cloud-init @@ -0,0 +1,12 @@ +#!/sbin/runscript +# add depends for network, dns, fs etc +depend() { + after cloud-init-local + before cloud-final + provide cloud-init +} + +start() { + cloud-init init + eend 0 +} diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local new file mode 100644 index 00000000..7c39ff78 --- /dev/null +++ b/sysvinit/gentoo/cloud-init-local @@ -0,0 +1,13 @@ +#!/sbin/runscript + +depend() { + after cloud-config + before cloud-init + before cloud-final + provide cloud-init-local +} + +start() { + cloud-init init --local + eend 0 +} -- cgit v1.2.3 From 2b416f666e26f37ad694d9cdefd0a80b77009848 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Fri, 24 Jan 2014 15:57:35 -0600 Subject: Fixes gentoo sysvinit ordering --- sysvinit/gentoo/cloud-config | 5 ++--- sysvinit/gentoo/cloud-final | 4 ++-- sysvinit/gentoo/cloud-init | 2 +- sysvinit/gentoo/cloud-init-local | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'sysvinit') diff --git a/sysvinit/gentoo/cloud-config b/sysvinit/gentoo/cloud-config index affd0cb3..b0fa786d 100644 --- a/sysvinit/gentoo/cloud-config +++ b/sysvinit/gentoo/cloud-config @@ -1,9 +1,8 @@ #!/sbin/runscript depend() { - after net # remove after nova-agent fix - before cloud-init-local - before cloud-init + after cloud-init-local + after cloud-init before cloud-final provide cloud-config } diff --git a/sysvinit/gentoo/cloud-final b/sysvinit/gentoo/cloud-final index 140c0f8e..b457a354 100644 --- a/sysvinit/gentoo/cloud-final +++ b/sysvinit/gentoo/cloud-final @@ -1,7 +1,7 @@ #!/sbin/runscript -# add depends for network, dns, fs etc + depend() { - after cloud-init + after cloud-config provide cloud-final } diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init index 6f3ff8ed..9ab64ad8 100644 --- a/sysvinit/gentoo/cloud-init +++ b/sysvinit/gentoo/cloud-init @@ -2,7 +2,7 @@ # add depends for network, dns, fs etc depend() { after cloud-init-local - before cloud-final + before cloud-config provide cloud-init } diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local index 7c39ff78..1d22a79d 100644 --- a/sysvinit/gentoo/cloud-init-local +++ b/sysvinit/gentoo/cloud-init-local @@ -1,9 +1,8 @@ #!/sbin/runscript depend() { - after cloud-config + after net # remove after nova-agent fix before cloud-init - before cloud-final provide cloud-init-local } -- cgit v1.2.3 From 0efeb26736ddae2967c14a9440088594da32070d Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 3 Feb 2014 16:53:31 -0600 Subject: Added is_excluded tests and updated gentoo init script --- setup.py | 2 -- sysvinit/gentoo/cloud-init-local | 1 - tests/unittests/test_distros/test_is_excluded.py | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/unittests/test_distros/test_is_excluded.py (limited to 'sysvinit') diff --git a/setup.py b/setup.py index b0766970..9118e5f6 100755 --- a/setup.py +++ b/setup.py @@ -39,14 +39,12 @@ def is_f(p): INITSYS_FILES = { 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], 'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)], - 'sysvinit_gentoo': [f for f in glob('sysvinit/gentoo/*') if is_f(f)], 'systemd': [f for f in glob('systemd/*') if is_f(f)], 'upstart': [f for f in glob('upstart/*') if is_f(f)], } INITSYS_ROOTS = { 'sysvinit': '/etc/rc.d/init.d', 'sysvinit_deb': '/etc/init.d', - 'sysvinit_gentoo': '/etc/init.d', 'systemd': '/etc/systemd/system/', 'upstart': '/etc/init/', } diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local index 1d22a79d..8c9968d8 100644 --- a/sysvinit/gentoo/cloud-init-local +++ b/sysvinit/gentoo/cloud-init-local @@ -1,7 +1,6 @@ #!/sbin/runscript depend() { - after net # remove after nova-agent fix before cloud-init provide cloud-init-local } diff --git a/tests/unittests/test_distros/test_is_excluded.py b/tests/unittests/test_distros/test_is_excluded.py new file mode 100644 index 00000000..53a4445c --- /dev/null +++ b/tests/unittests/test_distros/test_is_excluded.py @@ -0,0 +1,15 @@ +from cloudinit.distros import gentoo +import unittest + + +class TestIsExcluded(unittest.TestCase): + + def setUp(self): + self.distro = gentoo.Distro('gentoo', {}, None) + self.distro.exclude_modules = ['test-module'] + + def test_is_excluded_success(self): + self.assertEqual(self.distro.is_excluded('test-module'), True) + + def test_is_excluded_fail(self): + self.assertEqual(self.distro.is_excluded('missing'), None) -- cgit v1.2.3