Merge pull request #31 from jouvin/master

Fixes for kernel version locking and SL5 support
quattor · Mar 26, 2014 · 0e646c7 · 0e646c7
2 parents df9f320 + b80f4c1
commit 0e646c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/components/spma/config-common.pan b/components/spma/config-common.pan
@@ -21,8 +21,6 @@ unique template components/spma/config-common;
 
 include { 'components/spma/schema' };
 
-variable PACKAGE_MANAGER = 'yum';
-
 # Set prefix to root of component configuration.
 prefix '/software/components/spma';
 

diff --git a/components/spma/config-rpm.pan b/components/spma/config-rpm.pan
@@ -24,7 +24,7 @@ include { 'components/spma/config-common' };
 # Package to install
 "/software/packages" = pkg_repl("ncm-spma", "14.2.1-1", "noarch");
 
-
+'/software/components/spma/packager' = 'yum';
 "/software/components/spma/register_change" ?= list("/software/packages",
                                                     "/software/repositories");
 "/software/components/spma/run" ?= "yes";
diff --git a/quattor/client/rpms.pan b/quattor/client/rpms.pan
@@ -26,9 +26,16 @@ variable AII_OSINSTALL_EXTRAPKGS ?= list(
 
 '/software/packages' = {
     # Part of the OS, installed by Anaconda as part of the base packages
-    SELF[escape('yum-plugin-priorities')] = nlist();
+    if ( is_defined(OS_VERSION_PARAMS['majorversion']) && (OS_VERSION_PARAMS['majorversion'] == '5') ) {
+      SELF[escape('yum-priorities')] = nlist();
+    } else {
+      SELF[escape('yum-plugin-priorities')] = nlist();
+    };
     SELF[escape('yum-plugin-versionlock')] = nlist();
     SELF[escape('perl-AppConfig')] = nlist();
+    if ( OS_VERSION_PARAMS['majorversion'] == '5' ) {
+      SELF[escape('python-elementtree')] = nlist();
+    };
     if ( AII_V2_INSTALL ) {
         # Yum
         # Quattor