summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-11-20 12:07:06 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-11-20 12:07:06 -0500
commitac65eb3e27fc898701bc193ec9536099052d1d60 (patch)
tree23c12150b0dd649f376e203f48b73ecc6b1fa996
parente98291df585bcff57b27a4177d47d3ee2c67692c (diff)
Changes to the DHCP management code to use the new fields.
-rw-r--r--Makefile2
-rw-r--r--cobbler/action_litesync.py4
-rw-r--r--cobbler/modules/manage_isc.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ac19cf3d..9a06e197 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ restorestate:
chown -R apache /var/www/cobbler
chmod -R +x /var/www/cobbler/web
chmod -R +x /var/www/cobbler/svc
- #-[ "$(statepath)" != "/" ] && rm -rf $(statepath)
+ rm -rf $(statepath)
completion:
python mkbash.py
diff --git a/cobbler/action_litesync.py b/cobbler/action_litesync.py
index 2ec79c9b..b040db0a 100644
--- a/cobbler/action_litesync.py
+++ b/cobbler/action_litesync.py
@@ -150,7 +150,7 @@ class BootLiteSync:
for (name,interface) in system.interfaces.iteritems():
self.sync.dhcp.write_dhcp_lease(
self.settings.omapi_port,
- interface["hostname"],
+ interface["dns_name"],
interface["mac_address"],
interface["ip_address"]
)
@@ -170,7 +170,7 @@ class BootLiteSync:
for (name,interface) in system_record.interfaces.iteritems():
self.sync.dhcp.remove_dhcp_lease(
self.settings.omapi_port,
- interface["hostname"]
+ interface["dns_name"]
)
itanic = False
diff --git a/cobbler/modules/manage_isc.py b/cobbler/modules/manage_isc.py
index bafa54db..974cc6a2 100644
--- a/cobbler/modules/manage_isc.py
+++ b/cobbler/modules/manage_isc.py
@@ -183,7 +183,7 @@ class IscManager:
for (name, interface) in system.interfaces.iteritems():
mac = interface["mac_address"]
ip = interface["ip_address"]
- host = interface["hostname"]
+ host = interface["dns_name"]
# add references to the system, profile, and distro
# for use in the template