Make yum repo priority for imported repos configurable in settings.

mpdehaan · Aug 12, 2009 · 7f5ba0f · 7f5ba0f
1 parent 61942de
commit 7f5ba0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -25,6 +25,7 @@ Patches and other contributions from:
     Eoghan Gaffney <eoghan@noroutetohost.org>
     Dan Guernsey <danpg102@gmail.com>
     Marcel Haerry <haerry+et@puzzle.ch>
+    Peter Halliday <phalliday@excelsiorsystems.net>
     Niels Hasse <haase.niels@googlemail.com>
     Dave Hatton <dave@davehatton.it>
     Scott Henson <shenson@redhat.com>

diff --git a/CHANGELOG b/CHANGELOG
@@ -31,6 +31,7 @@ Cobbler CHANGELOG
 - (BUGF) deprecated omapi/omshell features for manage_isc now removed
 - (FEAT) removed configuration files for binary paths, will look for in PATH
 - (FEAT) removed configuration settings indicating where some config files are
+- (FEAT) yum priorities plugin setting for distro repos now tweakable in settings
 
 - - 1.6.9
 - (FEAT/cobbler) cobbler can now pass the virtio26 os version to virtinst, so virtio drivers can be used for RHEL5

diff --git a/cobbler/action_import.py b/cobbler/action_import.py
@@ -481,7 +481,7 @@ def process_comps_file(self, comps_path, distro):
            config_file.write("baseurl=http://@@http_server@@/cobbler/ks_mirror/%s\n" % (urlseg))
            config_file.write("enabled=1\n")
            config_file.write("gpgcheck=0\n")
-           config_file.write("priority=1\n")
+           config_file.write("priority=$yum_distro_priority\n")
            config_file.close()
 
            # don't run creatrepo twice -- this can happen easily for Xen and PXE, when

diff --git a/cobbler/settings.py b/cobbler/settings.py
@@ -105,6 +105,7 @@
     "xmlrpc_port"                 : 25151,
     "yum_post_install_mirror"     : 1,
     "createrepo_flags"            : "-c cache -s sha",
+    "yum_distro_priority"         : 1,
     "yumdownloader_flags"         : "--resolve",
     "reposync_flags"              : "-l -m -d"
 }

diff --git a/installer_templates/settings.template b/installer_templates/settings.template
@@ -366,6 +366,10 @@ xmlrpc_port: 25151
 # configuration can still be done manually.  This is just a shortcut.
 yum_post_install_mirror: $yum_post_install_mirror
 
+# the default yum priority for all the distros.  This is only used
+# if yum-priorities plugin is used.  1=maximum.  Tweak with caution.
+yum_distro_priority: 1
+
 # Flags to use for yumdownloader.  Not all versions may support 
 # --resolve.
 yumdownloader_flags: "--resolve"