Functionality originally in 60fe75a5, but reverted by 4a7eee30 and 9113a190 amidst a raft of other changes. --- cobbler/action_sync.py | 7 ++++--- installer_templates/defaults | 1 + installer_templates/settings.template | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 43f5e6d..4edcc28 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -136,9 +136,10 @@ class BootSync: self.dns.regen_hosts() self.dns.write_dns_files()
- if self.verbose: - self.logger.info("rendering Rsync files") - self.rsync_gen() + if self.settings.manage_rsync: + if self.verbose: + self.logger.info("rendering Rsync files") + self.rsync_gen()
if self.verbose: self.logger.info("generating PXE menu structure") diff --git a/installer_templates/defaults b/installer_templates/defaults index 3da4476..efa7a6b 100644 --- a/installer_templates/defaults +++ b/installer_templates/defaults @@ -4,6 +4,7 @@ dns_module: 'manage_bind' dhcp_module: 'manage_isc' enable_dhcp: 0 enable_dns: 0 +enable_rsync: 1 next_server: '127.0.0.1' pxe_once: 0 redhat_management_type: "off" diff --git a/installer_templates/settings.template b/installer_templates/settings.template index 2777b73..1ba1a0b 100644 --- a/installer_templates/settings.template +++ b/installer_templates/settings.template @@ -168,6 +168,9 @@ mgmt_classes: [] mgmt_parameters: from_cobbler: 1
+# set to 1 to enable Cobbler's RSYNC management features. +manage_rsync: $enable_rsync + # set to 1 to enable Cobbler's DHCP management features. # the choice of DHCP management engine is in /etc/cobbler/modules.conf manage_dhcp: $enable_dhcp