diff options
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/item_profile.py | 8 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 6 |
3 files changed, 9 insertions, 7 deletions
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: |