From b8c7846c557c6c0cf69003cf9475df36195e5065 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 30 May 2007 16:16:46 -0400 Subject: WIP: Allow system names to be anything, and gather mac address and IP from either the inferred sytem name or the values given to --ip-address (--ip) or --mac-address (--mac). Change the action code to use this, and not create PXE entries when such info is not available. --- cobbler/cobbler.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cobbler/cobbler.py') diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py index fda1772..0daaf85 100755 --- a/cobbler/cobbler.py +++ b/cobbler/cobbler.py @@ -471,8 +471,11 @@ class BootCLI: '--kopts' : lambda(a) : sys.set_kernel_options(a), '--ksmeta' : lambda(a) : sys.set_ksmeta(a), '--hostname' : lambda(a) : sys.set_hostname(a), - '--pxe-address' : lambda(a) : sys.set_ip_address(a), - '--ip-address' : lambda(a) : sys.set_ip_address(a) + '--pxe-address' : lambda(a) : sys.set_ip_address(a), # deprecated + '--ip-address' : lambda(a) : sys.set_ip_address(a), + '--ip' : lambda(a) : sys.set_ip_address(a), # alias + '--mac-address' : lambda(a) : sys.set_mac_address(a), + '--mac' : lambda(a) : sys.set_mac_address(a) # alias } def on_ok(): self.api.systems().add(sys, with_copy=self.api.sync_flag) -- cgit