diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cobbler.spec | 109 | ||||
| -rw-r--r-- | cobbler/item_profile.py | 8 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 6 | ||||
| -rw-r--r-- | config/settings | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
7 files changed, 20 insertions, 112 deletions
@@ -1,6 +1,9 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +* Mon Jan 21 2007 - 0.7.2 +- default_virt_file_size and default_virt_ram added to settings + * Wed Jan 09 2007 - 0.7.1 - allow imports to force usage of a specific kickstart template with --kickstart - added --yumopts parameter to repos (works just like --kopts/--ksmeta) diff --git a/cobbler.spec b/cobbler.spec index c852f5f..f33a340 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 21 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.2-1 +- Upstream changes (see CHANGELOG) +- prune changelog, see git for full + * Mon Jan 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1 - Upstream changes (see CHANGELOG) - Generalize what files are included in RPM @@ -282,106 +286,3 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT - Upstream changes (see CHANGELOG) - Cobbler RPM now owns various directories it uses versus creating them using commands. - Bundling a copy of Cheetah for older distros - -* Mon Jan 28 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.9-1 -- Changed init script pre/post code to match FC-E guidelines/example -- Shortened RPM description -- (also see CHANGELOG) - -* Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.8-1 -- Upstream changes (see CHANGELOG) - -* Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.7-1 -- Upstream changes (see CHANGELOG) -- Added packaging for new logfile directory and syslog watcher daemon -- Added Requires for mod_python -- Added sample FC6 kickstart that I forgot to add from months ago. doh! -- Added FC6 mini domU kickstart - -* Thu Dec 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.6-1 -- Upstream changes (see CHANGELOG) -- Description updated -- Added mod_python kickstart watcher script and associated logging changes - -* Thu Dec 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.5-4 -- Upstream changes (see CHANGELOG) -- Added createrepo as Requires -- BuildRequires: python-devel (needed for 2.5) - -* Tue Dec 05 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.4-1 -- Upstream changes (see CHANGELOG) - -* Tue Nov 14 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.3-1 -- Upstream changes (see CHANGELOG) - -* Thu Oct 26 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.2-1 -- Upstream changes (see CHANGELOG) - -* Wed Oct 25 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.1-1 -- Upstream changes (see CHANGELOG) -- Updated description - -* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.0-1 -- Upstream changes (see CHANGELOG) -- Marked files in /etc/cobbler as config -- Marked /etc/cobbler/dhcpd.template as noreplace - -* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.9-1 -- Upstream changes (see CHANGELOG) - -* Wed Oct 18 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.8-1 -- Upstream changes (see CHANGELOG) - -* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1 -- Upstream changes (see CHANGELOG), includes removing pexpect as a require -- This RPM now builds on RHEL4 - -* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1 -- Upstream changes (see CHANGELOG), includes removing Cheetah as a require - -* Mon Oct 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1 -- Upstream features and bugfixes (see CHANGELOG) -- Packaged additional kickstart file and specfile cleanup - -* Thu Oct 12 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.4-1 -- Upstream features and bugfixes (see CHANGELOG) - -* Mon Oct 9 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.3-1 -- Upstream features (see CHANGELOG) & URL update - -* Fri Oct 6 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.2-1 -- Upstream bugfixes - -* Fri Sep 29 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.1-2 -- URL update - -* Thu Sep 28 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.1-1 -- Upstream pull of bugfixes and new remote system "enchant" feature - -* Fri Sep 22 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.0-1 -- Lots of new PXE and dhcpd.conf upstream, elilo.efi now included. - -* Thu Sep 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-8 -- Added doc files to doc, removed INSTALLED_FILES code - -* Wed Sep 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-7 -- Upstream updates - -* Fri Sep 15 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-6 -- Make koan own it's directory, add GPL "COPYING" file. - -* Wed Aug 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-5 -- Spec file tweaks only for FC-Extras - -* Thu Jul 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-4 -- Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module. - -* Wed Jul 12 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-3 -- Added templating support using Cheetah - -* Thu Jul 9 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.0-2 -- Fedora-Extras rpm spec tweaks - -* Tue Jun 28 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.0-1 -- rpm genesis - diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py index b8aae59..14b1e08 100644 --- a/cobbler/item_profile.py +++ b/cobbler/item_profile.py @@ -39,8 +39,8 @@ class Profile(item.Item): self.kernel_options = ({}, '<<inherit>>')[is_subobject] self.ks_meta = ({}, '<<inherit>>')[is_subobject] self.virt_cpus = (1, '<<inherit>>')[is_subobject] - self.virt_file_size = (5, '<<inherit>>')[is_subobject] - self.virt_ram = (512, '<<inherit>>')[is_subobject] + self.virt_file_size = (self.settings.default_virt_file_size, '<<inherit>>')[is_subobject] + self.virt_ram = (self.settings.default_virt_ram, '<<inherit>>')[is_subobject] self.repos = ([], '<<inherit>>')[is_subobject] self.depth = 1 self.virt_type = (self.settings.default_virt_type, '<<inherit>>')[is_subobject] @@ -72,8 +72,8 @@ class Profile(item.Item): self.set_parent(self.parent) # virt specific - self.virt_ram = self.load_item(seed_data,'virt_ram',512) - self.virt_file_size = self.load_item(seed_data,'virt_file_size',5) + self.virt_ram = self.load_item(seed_data,'virt_ram',self.settings.default_virt_ram) + self.virt_file_size = self.load_item(seed_data,'virt_file_size',self.settings.default_virt_file_size) self.virt_path = self.load_item(seed_data,'virt_path') self.virt_type = self.load_item(seed_data,'virt_type', self.settings.default_virt_type) self.virt_bridge = self.load_item(seed_data,'virt_bridge', self.settings.default_virt_bridge) diff --git a/cobbler/settings.py b/cobbler/settings.py index c391554..86a24af 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -29,6 +29,8 @@ DEFAULTS = { "default_kickstart" : "/etc/cobbler/default.ks", "default_virt_bridge" : "xenbr0", "default_virt_type" : "auto", + "default_virt_file_size" : "5", + "default_virt_ram" : "512", "dhcpd_conf" : "/etc/dhcpd.conf", "dhcpd_bin" : "/usr/sbin/dhcpd", "dnsmasq_bin" : "/usr/sbin/dnsmasq", diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index f0c1028..ae07b98 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,10 +33,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1197586818.889889 -__CHEETAH_genTimestamp__ = 'Thu Dec 13 18:00:18 2007' +__CHEETAH_genTime__ = 1200929257.00021 +__CHEETAH_genTimestamp__ = 'Mon Jan 21 10:27:37 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' -__CHEETAH_srcLastModified__ = 'Tue Dec 4 17:33:59 2007' +__CHEETAH_srcLastModified__ = 'Tue Jan 15 14:27:10 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: diff --git a/config/settings b/config/settings index 245fc17..c006cb3 100644 --- a/config/settings +++ b/config/settings @@ -5,6 +5,8 @@ bootloaders: default_kickstart: /etc/cobbler/default.ks default_virt_bridge: xenbr0 default_virt_type: auto +default_virt_file_size: 5 +default_virt_ram: 512 dhcpd_bin: /usr/sbin/dhcpd dhcpd_conf: /etc/dhcpd.conf dnsmasq_bin: /usr/sbin/dnsmasq @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.7.1" +VERSION = "0.7.2" SHORT_DESC = "Network Boot and Update Server" LONG_DESC = """ Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP Management. Cobbler has a Python API for integration with other GPL systems management applications. |