diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | NEWS | 26 | ||||
| -rw-r--r-- | cobbler.pod | 29 | ||||
| -rw-r--r-- | cobbler.spec | 1 | ||||
| -rw-r--r-- | cobbler/cobbler_msg.py | 1 | ||||
| -rw-r--r-- | cobbler/item.py | 6 |
6 files changed, 36 insertions, 28 deletions
@@ -12,6 +12,7 @@ Patches and other contributions from: Jim Meyering <jim@meyering.net> Mihai Ibanescu <mihai.ibanescu@gmail.com> Tru Huynh <tru@pasteur.fr> + Scott Seago <sseago@redhat.com> [...send patches to get your name here...] @@ -1,19 +1,21 @@ Cobbler NEWS (all entries mdehaan@redhat.com unless noted otherwise) -0.3.5 contains a more strict rsync.excludes file and now -runs createrepo after import to build more correct repodata -based on the results of that file. In addition some bugs were -fixed in the import code. New experimental commands for -generalized repo mirroring are now in cobbler, though they -are not yet documented. +================================= -0.3.4 contains a /etc/rsync.exclude file that minimizes -the amount of files transferred during a cobbler import. By -default, PPC, ISO, and debug content are not transferred -from "cobbler import" commands. Users can customize this -file. Imports will now use less bandwidth and take up -less disk space. +Starting with 0.4.2, PXE menus are supported, so RHEL4 users should upgrade their +syslinux: +wget http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.36.tar.gz +yum install netpbm-progs nasm +rpmbuild -ta syslinux-3.36.tar.gz +rpm -Fvh /usr/src/redhat/RPMS/i386/syslinux-3.36-1.i386.rpm # the other RPMs are not required. +Change in /var/lib/cobbler/settings this line: +standard: /usr/lib/syslinux/pxelinux.0 + +to this: +standard: /usr/share/syslinux/pxelinux.0 + +================================= diff --git a/cobbler.pod b/cobbler.pod index 2da2d00..ebca9ef 100644 --- a/cobbler.pod +++ b/cobbler.pod @@ -195,13 +195,8 @@ repo seperately. Here's an example of what looks like a good URL: -rsync://yourmirror.example.com/fedora-linux-core/6/i386 (for rsync protocol) -user@yourmirror.example.com/fedora-linux-core/6/i386 (for SSH) - -These are bad URL's: - -rsync://yourmirror.example.com/fedora-linux-core/ -rsync://yourmirror.example.com/fedora-linux-core/6/ +rsync://yourmirror.example.com/fedora-linux-core/updates/6/i386 (for rsync protocol) +user@yourmirror.example.com/fedora-linux-core/updates/6/i386 (for SSH) To put it more simply, if the content you are mirroring doesn't contain rpm's at the top level of the URL, this is bad, and you need to specify a different value. Using the @@ -277,12 +272,18 @@ This example shows how to create a provisioning infrastructure from a distributi Then a default PXE configuration is created, so that by default systems will PXE boot into a fully automated install process for that distribution. +You can use a network rsync mirror or a mounted DVD location. + =over B<cobbler check> B<cobbler import --mirror=rsync://yourfavoritemirror.com/foo --mirror-name=anyname> +# OR + +B<cobbler import --mirror=root@localhost:/mnt/dvd --mirror-name=anyname> + # wait for mirror to rsync... B<cobbler report> @@ -439,21 +440,23 @@ Example: B<cobbler enchant --virt=yes --address=192.168.10.10 --profile=fc6xen> =head2 IMPORTING TREES -Cobbler can auto-add distributions and profiles from remote sources, whether this is an NFS path or an rsync mirror. This can save a lot of time when setting up a new provisioning environment. Rudimentary support is also provided for importing from a http:// mirror, but rsync works much better and is the recommended route. +Cobbler can auto-add distributions and profiles from remote sources, whether this is an NFS path or an rsync mirror. This can save a lot of time when setting up a new provisioning environment. When importing a rsync mirror, cobbler will try to detect the distribution type and automatically assign kickstarts. By default, it will provision the system by erasing the hard drive, setting up eth0 for dhcp, and using a default password of "cobbler". If this is undesirable, edit the kickstart files in /etc/cobbler to do something else or change the kickstart setting after cobbler creates the profile. -Usage: B<cobbler import --path=path> - -Usage; B<cobbler import --mirror=rsync_url> --mirror-name=<string>> +Note that if you use --path instead of --mirror, no files will actually be copied. Most of the time, usage of --mirror is preferred, to create a local copy of the files you are importing. These files are saved automatically in /var/www/cobbler/ks_mirror. -Example: B<cobbler import --mirror=rsync://mirror.linux.duke.edu/fedora-linux-core/ --mirror-name=fedora> +Example: B<cobbler import --mirror=rsync://mirrorserver.example.com/path/ --mirror-name=fedora> Example2: B<cobbler import --mirror=root@192.168.1.10:/stuff --mirror-name=bar> +Example3: B<cobbler import --mirror=root@localhost:/mnt/dvd --mirror-name=baz> + +Example4: B<cobbler import --path=/path/to/stuff --mirror-name=glorp> + Once imported, run a "cobbler list" or "cobbler report" to see what you've added. -"Cobbler sync" must still be run after an import to get the system ready to provision what was just imported. +"Cobbler sync" should still be run after an import to get the system ready to provision what was just imported. By default, the rsync operations will exclude PPC content, debug RPMs, and ISO images -- to change what is excluded during an import, see /etc/cobbler/rsync.exclude. diff --git a/cobbler.spec b/cobbler.spec index 4824968..0e31c08 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -107,6 +107,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT * Tue Feb 20 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.3-0 - Upstream changes (see CHANGELOG) +- Description cleanup * Mon Feb 19 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.2-0 - Upstream changes (see CHANGELOG) diff --git a/cobbler/cobbler_msg.py b/cobbler/cobbler_msg.py index 3e32e9d..6396706 100644 --- a/cobbler/cobbler_msg.py +++ b/cobbler/cobbler_msg.py @@ -125,6 +125,7 @@ _msg_table = { "exc_no_template" : "can't read /etc/cobbler/dhcp.template", "exc_dhcp_nomac" : "when cobbler is managing dhcpd.conf, all system names must be MAC addresses. Aborting.", "exc_ia64_noip" : "due to an IA64 bootloader limitation, system (%s) must define a pxe-address value (which is an IP address)", + "exc_kopts" : "Kernel options should be a space delimited list of values and key=value pairs", "lock" : "Locked. If cobbler is currently running, wait for termination, otherwise remove /var/lib/cobbler/lock", "check_ok" : """ No setup problems found. diff --git a/cobbler/item.py b/cobbler/item.py index 1249229..4263494 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -29,11 +29,11 @@ class Item(serializable.Serializable): def set_kernel_options(self,options): """ Kernel options are a space delimited list, - like 'a=b,c=d,e=f' or as a hash. + like 'a=b c=d e=f g h i=j' or a hash. """ - (success, value) = utils.input_string_or_hash(options," ") + (success, value) = utils.input_string_or_hash(options,None) if not success: - return False + raise cexceptions.CobblerException("exc_kopts") else: self.kernel_options = value return True |