diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-02 16:50:33 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-02 16:50:33 -0400 |
| commit | 35fd760f0fc069906da78aebf4a1ecb3e2414291 (patch) | |
| tree | c771737cbb5c9829ca946733ee29beb385ffee9a /cobbler | |
| parent | 6ffd4eca30766153aa920888411f6437948757b2 (diff) | |
| download | third_party-cobbler-35fd760f0fc069906da78aebf4a1ecb3e2414291.tar.gz third_party-cobbler-35fd760f0fc069906da78aebf4a1ecb3e2414291.tar.xz third_party-cobbler-35fd760f0fc069906da78aebf4a1ecb3e2414291.zip | |
Added some check code for BIND.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_check.py | 16 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/cobbler/action_check.py b/cobbler/action_check.py index 2004c9f..e81e66c 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -51,8 +51,8 @@ class BootCheck: if self.settings.manage_dns: mode = self.config.api.get_sync().manager.what() if mode == "isc_and_bind": - #self.check_bind_bin(status) - #self.check_service(status,"dhcpd") + self.check_bind_bin(status) + self.check_service(status,"named") pass self.check_service(status, "cobblerd") @@ -118,14 +118,22 @@ class BootCheck: Check if dhcpd is installed """ if not os.path.exists(self.settings.dhcpd_bin): - status.append(_("dhcpd isn't installed, but is enabled in /var/lib/cobbler/settings")) + status.append(_("dhcpd isn't installed, but management is enabled in /var/lib/cobbler/settings")) def check_dnsmasq_bin(self,status): """ Check if dnsmasq is installed """ if not os.path.exists(self.settings.dnsmasq_bin): - status.append(_("dnsmasq isn't installed, but is enabled in /var/lib/cobbler/settings")) + status.append(_("dnsmasq isn't installed, but management is enabled in /var/lib/cobbler/settings")) + + def check_bind_bin(self,status): + """ + Check if bind is installed. + """ + if not os.path.exists(self.settings.bind_bin): + status.append(_("bind isn't installed, but management is enabled in /var/lib/cobbler/settings")) + def check_bootloaders(self,status): """ diff --git a/cobbler/settings.py b/cobbler/settings.py index 70b2ac8..bf12545 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -24,6 +24,7 @@ TESTMODE = False DEFAULTS = { "allow_duplicate_macs" : 0, "allow_duplicate_ips" : 0, + "bind_bin" : "/usr/sbin/named", "bootloaders" : { "standard" : "/usr/lib/syslinux/pxelinux.0", "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" @@ -64,6 +65,7 @@ DEFAULTS = { "next_server" : "127.0.0.1", "omapi_enabled" : 0, "omapi_port" : 647, + "omshell_bin" : "/usr/bin/omshell", "pxe_just_once" : 0, "register_new_installs" : 0, "run_install_triggers" : 1, |