x/cloud-init
Code Issues Proposed changes

Added is_excluded tests and updated gentoo init script

Browse Source
This commit is contained in:
Nate House nathan.house@rackspace.com 2014-02-03 16:53:31 -06:00
parent c4e470a227
commit 4cb4a919c5
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -39,14 +39,12 @@ def is_f(p):
INITSYS_FILES = { INITSYS_FILES = {
'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], '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_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)], 'systemd': [f for f in glob('systemd/*') if is_f(f)],
'upstart': [f for f in glob('upstart/*') if is_f(f)], 'upstart': [f for f in glob('upstart/*') if is_f(f)],
} }
INITSYS_ROOTS = { INITSYS_ROOTS = {
'sysvinit': '/etc/rc.d/init.d', 'sysvinit': '/etc/rc.d/init.d',
'sysvinit_deb': '/etc/init.d', 'sysvinit_deb': '/etc/init.d',
'sysvinit_gentoo': '/etc/init.d',
'systemd': '/etc/systemd/system/', 'systemd': '/etc/systemd/system/',
'upstart': '/etc/init/', 'upstart': '/etc/init/',
} }

1
sysvinit/gentoo/cloud-init-local
View File

@ -1,7 +1,6 @@
#!/sbin/runscript #!/sbin/runscript
depend() { depend() {
after net # remove after nova-agent fix
before cloud-init before cloud-init
provide cloud-init-local provide cloud-init-local
} }

15
tests/unittests/test_distros/test_is_excluded.py Normal file
View File

@ -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)