diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 14:58:20 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 14:58:20 -0400 |
| commit | 1e7b1b8ba5a982ca801a4d8246934a2315dd5931 (patch) | |
| tree | eb9138807fdb1b68143ac7bcf89828b2e8c3d003 /cobbler/modules | |
| parent | 449e841102ab32c88c3559b92069ba648bd61a8d (diff) | |
| download | third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.gz third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.xz third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.zip | |
Remove references to manage_dhcp_mode and manage_dns_mode as this is governed by modules.conf, and rewrite the restart-services trigger to understand restart_dhcp and restart_dns variables, which are now mentioned in the settings file. Also, clean up the tests so they work more nicely on F9, and remove some unused lines from the Makefile.
Diffstat (limited to 'cobbler/modules')
| -rw-r--r-- | cobbler/modules/manage_bind.py | 2 | ||||
| -rw-r--r-- | cobbler/modules/manage_isc.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cobbler/modules/manage_bind.py b/cobbler/modules/manage_bind.py index 339fbf0..d88c87c 100644 --- a/cobbler/modules/manage_bind.py +++ b/cobbler/modules/manage_bind.py @@ -49,7 +49,7 @@ def register(): class BindManager: def what(self): - return "isc_and_bind" + return "bind" def __init__(self,config,verbose=False): """ diff --git a/cobbler/modules/manage_isc.py b/cobbler/modules/manage_isc.py index c398270..5e4fbf6 100644 --- a/cobbler/modules/manage_isc.py +++ b/cobbler/modules/manage_isc.py @@ -48,7 +48,7 @@ def register(): class IscManager: def what(self): - return "isc_and_bind" + return "isc" def __init__(self,config,verbose=False): """ @@ -130,7 +130,6 @@ class IscManager: settings_file = self.settings.dhcpd_conf template_file = "/etc/cobbler/dhcp.template" - mode = self.settings.manage_dhcp_mode.lower() try: f2 = open(template_file,"r") |