diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 15 | ||||
| -rw-r--r-- | cobbler/api.py | 12 | ||||
| -rwxr-xr-x | cobbler/cobbler.py | 36 | ||||
| -rw-r--r-- | cobbler/settings.py | 58 | ||||
| -rw-r--r-- | obsolete/action_enchant.py (renamed from cobbler/action_enchant.py) | 0 |
6 files changed, 33 insertions, 90 deletions
@@ -6,6 +6,8 @@ Cobbler CHANGELOG - fix bug that allows empty mac addresses (None) in dhcpd.conf - kickstarts automatically save kickstart file used to /root/cobbler.ks - allow multiple (comma-seperated) values for --virt-size +- removed deprecated 'enchant' function (use SSH and koan instead) +- cleanup of a few unused settings * Thu Aug 30 2007 - 0.6.1 - re enable --resolve in yumdownloader (cobbler repo mgmt feature) diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index c5621c6..12be718 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -62,7 +62,6 @@ class BootSync: if not os.path.exists(self.settings.tftpboot): raise CX(_("cannot find directory: %s") % self.settings.tftpboot) self.clean_trees() - self.copy_koan() self.copy_bootloaders() self.copy_distros() self.validate_kickstarts() @@ -93,20 +92,6 @@ class BootSync: except OSError, e: print _("Warning: %s restart failed: ") % service, e - def copy_koan(self): - """ - This is just for the "enchant" feature which a lot of folks - probably don't use... enchant automates an SSH into a remote - system, including koan installation if need be. - """ - koan_path = self.settings.koan_path - if koan_path is None or koan_path == "": - return - if not os.path.isfile(koan_path): - raise CX(_("missing koan, check koan_path in /var/lib/cobbler/settings")) - base = os.path.basename(koan_path) - self.copyfile(koan_path, os.path.join(self.settings.webdir, base)) - def copy_bootloaders(self): """ Copy bootloaders to the configured tftpboot directory diff --git a/cobbler/api.py b/cobbler/api.py index 6b22d30..f5d3322 100644 --- a/cobbler/api.py +++ b/cobbler/api.py @@ -18,7 +18,6 @@ import config import utils import action_sync import action_check -import action_enchant import action_import import action_reposync import action_status @@ -41,7 +40,6 @@ class BootAPI: self._config = config.Config(self) self.deserialize() self.__settings = self._config.settings() - self.sync_flag = self.__settings.minimize_syncs def version(self): """ @@ -198,16 +196,6 @@ class BootAPI: reposync = action_reposync.RepoSync(self._config) return reposync.run() - def enchant(self,address,profile,systemdef,is_virt): - """ - Re-kickstart a running system. - Either profile or systemdef should be a name of a - profile or system definition, the other should be None. address is an - address reachable by SSH. - """ - enchanter = action_enchant.Enchant(self._config,address,profile,systemdef,is_virt) - return enchanter.run() - def status(self,mode): statusifier = action_status.BootStatusReport(self._config, mode) return statusifier.run() diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py index 4436a43..7ecb2d6 100755 --- a/cobbler/cobbler.py +++ b/cobbler/cobbler.py @@ -101,9 +101,6 @@ class BootCLI: 'sync' : self.sync, 'reposync' : self.reposync, 'import' : self.import_tree, - 'enchant' : self.enchant, - 'clobber' : self.enchant, - 'transmogrify' : self.enchant, 'status' : self.status, 'reserialize' : self.reserialize, 'help' : self.usage, @@ -635,39 +632,6 @@ class BootCLI: return self.api.status(self.mode) return self.apply_args(args, commands, go_status) - def enchant(self,args): - """ - Reinstall a system: - 'cobbler system enchant --name='foo' [--password='foo'] - """ - self.temp_profile = None - self.temp_system = None - self.temp_address = None - self.is_virt = False - def set_is_virt(a): - if a.lower() in [ "0", "false", "no", "n", "off" ]: - self.is_virt = False - elif a.lower() in [ "1", "true", "yes", "y", "on" ]: - self.is_virt = True - else: - raise CX("reject_arg","virt") - def set_profile(a): - self.temp_profile = a - def set_system(a): - self.temp_system = a - def set_address(a): - self.temp_address = a - def go_enchant(): - return self.api.enchant(self.temp_address,self.temp_profile,self.temp_system,self.is_virt) - commands = { - '--address' : lambda(a): set_address(a), - '--profile' : lambda(a): set_profile(a), - '--system' : lambda(a): set_system(a), - '--virt' : lambda(a): set_is_virt(a) - } - on_ok = lambda: go_enchant() - return self.apply_args(args,commands,on_ok) - def import_tree(self,args): """ Import a directory tree and auto-create distros & profiles. diff --git a/cobbler/settings.py b/cobbler/settings.py index d2e4b39..f8b32e6 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -19,37 +19,41 @@ from rhpl.translate import _, N_, textdomain, utf8 TESTMODE = False DEFAULTS = { - "httpd_bin" : "/usr/sbin/httpd", - "dhcpd_conf" : "/etc/dhcpd.conf", - "dnsmasq_conf" : "/etc/dnsmasq.conf", - "tftpd_bin" : "/usr/sbin/in.tftpd", - "server" : "127.0.0.1", - "next_server" : "127.0.0.1", - "dhcpd_bin" : "/usr/sbin/dhcpd", - "dnsmasq_bin" : "/usr/sbin/dnsmasq", - "kernel_options" : { - "lang" : " ", - "text" : None, - "ksdevice" : "eth0", + "bootloaders" : { + "standard" : "/usr/lib/syslinux/pxelinux.0", + "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" }, - "tftpd_conf" : "/etc/xinetd.d/tftp", - "tftpboot" : "/tftpboot", - "webdir" : "/var/www/cobbler", - "snippetsdir" : "/var/lib/cobbler/snippets", - "default_kickstart" : "/etc/cobbler/default.ks", - "manage_dhcp" : 0, - "manage_dhcp_mode" : "isc", - "koan_path" : "", - "bootloaders" : { - "standard" : "/usr/lib/syslinux/pxelinux.0", - "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" + "default_kickstart" : "/etc/cobbler/default.ks", + "default_virt_type" : "auto", + "dhcpd_conf" : "/etc/dhcpd.conf", + "dhcpd_bin" : "/usr/sbin/dhcpd", + "dnsmasq_bin" : "/usr/sbin/dnsmasq", + "dnsmasq_conf" : "/etc/dnsmasq.conf", + "httpd_bin" : "/usr/sbin/httpd", + "kernel_options" : { + "lang" : " ", + "text" : None, + "ksdevice" : "eth0", + }, + "manage_dhcp" : 0, + "manage_dhcp_mode" : "isc", + "next_server" : "127.0.0.1", + "pxe_just_once" : 0, + "server" : "127.0.0.1", + "snippetsdir" : "/var/lib/cobbler/snippets", + "storage_modules" : { + "distros" : [ 'yaml' ], + "profiles" : [ 'yaml' ], + "systems" : [ 'yaml' ], + "repos" : [ 'yaml' ], }, "syslog_port" : 25150, + "tftpboot" : "/tftpboot", + "tftpd_bin" : "/usr/sbin/in.tftpd", + "tftpd_conf" : "/etc/xinetd.d/tftp", + "webdir" : "/var/www/cobbler", "xmlrpc_port" : 25151, - "minimize_syncs" : 1, - "yum_core_mirror_from_server" : 0, - "default_virt_type" : "auto", - "pxe_just_once" : 0 + "yum_core_mirror_from_server" : 0 } diff --git a/cobbler/action_enchant.py b/obsolete/action_enchant.py index 4a54ebe..4a54ebe 100644 --- a/cobbler/action_enchant.py +++ b/obsolete/action_enchant.py |