Merge pull request #29 from jouvin/13.1.3

Update base Quattor configuration files for 13.1.3 release (AII fix)
quattor · Mar 27, 2014 · 076714c · 076714c
2 parents 99986c1 + 1f44e36
commit 076714c
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 28 deletions.
diff --git a/quattor/aii/config.pan b/quattor/aii/config.pan
@@ -8,7 +8,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # server, 13.1.2, 20131015-1053
+      # server, 13.1.3, 20140318-2329
       #
 #
 # This file is the standard aii configuration. It only performs some

diff --git a/quattor/aii/dhcp/config.pan b/quattor/aii/dhcp/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 13.1.2, 20131015.1053.34
+# dhcp, 13.1.3, 20140318.2329.20
 #
 template quattor/aii/dhcp/config;
 

diff --git a/quattor/aii/dhcp/rpms.pan b/quattor/aii/dhcp/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 13.1.2, 20131015.1053.34
+# dhcp, 13.1.3, 20140318.2329.20
 #
 
 # Template adding aii-dhcp rpm to the configuration
 
 unique template quattor/aii/dhcp/rpms;
 
-"/software/packages"=pkg_repl("aii-dhcp","13.1.2-1","noarch");
+"/software/packages"=pkg_repl("aii-dhcp","13.1.3-1","noarch");
diff --git a/quattor/aii/dhcp/schema.pan b/quattor/aii/dhcp/schema.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# dhcp, 13.1.2, 20131015.1053.34
+# dhcp, 13.1.3, 20140318.2329.20
 #
 
 unique template quattor/aii/dhcp/schema;

diff --git a/quattor/aii/ks/config.pan b/quattor/aii/ks/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # ks, 13.1.2, 20131015.1053.34
+      # ks, 13.1.3, 20140318.2329.20
       #
 
 # Template containing the Kickstart-related configuration and default

diff --git a/quattor/aii/ks/rpms.pan b/quattor/aii/ks/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-      # ks, 13.1.2, 20131015.1053.34
+      # ks, 13.1.3, 20140318.2329.20
       #
 
 # Template adding aii-ks rpm to the configuration
 
 unique template quattor/aii/ks/rpms;
 
-"/software/packages"=pkg_repl("aii-ks","13.1.2-1","noarch");
+"/software/packages"=pkg_repl("aii-ks","13.1.3-1","noarch");
diff --git a/quattor/aii/ks/schema.pan b/quattor/aii/ks/schema.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # ks, 13.1.2, 20131015.1053.34
+      # ks, 13.1.3, 20140318.2329.20
       #
 # Structure for the component generating kickstart files.
 

diff --git a/quattor/aii/ks/variants/fedora14.pan b/quattor/aii/ks/variants/fedora14.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # ks, 13.1.2, 20131015.1053.34
+      # ks, 13.1.3, 20140318.2329.20
       #
 
 # Template containing OS configuration and default values.

diff --git a/quattor/aii/ks/variants/sl6.pan b/quattor/aii/ks/variants/sl6.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # ks, 13.1.2, 20131015.1053.34
+      # ks, 13.1.3, 20140318.2329.20
       #
 
 # Template containing OS configuration and default values.
@@ -17,17 +17,11 @@ template quattor/aii/ks/variants/sl6;
 # Remove deprecated options 
 "/system/aii/osinstall/ks/mouse" = null;
 "/system/aii/osinstall/ks/langsupport" = null;
+"/system/aii/osinstall/ks/packages_args" = list("--ignoremissing");
 
 "/system/aii/osinstall/ks/end_script" = "%end";
 "/system/aii/osinstall/ks/part_label" = true;
 "/system/aii/osinstall/ks/volgroup_required" = false;
 
-"/system/aii/osinstall/ks/packages" = {
-  SELF[length(SELF)] = 'perl-parent';
-  SELF[length(SELF)] = 'perl-GSSAPI';
-  SELF[length(SELF)] = 'perl-Template-Toolkit';
-  SELF;
-};
-
 #add needed packages for @INC at post-install step :
 "/system/aii/osinstall/ks/extra_packages" ?= push("perl-CAF", "perl-LC", "perl-AppConfig",);
diff --git a/quattor/aii/pxelinux/config.pan b/quattor/aii/pxelinux/config.pan
@@ -7,7 +7,7 @@
 # ${developer-info
 # ${author-info}
 # #
-# pxelinux, 13.1.2, 20131015.1053.34
+# pxelinux, 13.1.3, 20140318.2329.20
 #
 template quattor/aii/pxelinux/config;
 

diff --git a/quattor/aii/pxelinux/rpms.pan b/quattor/aii/pxelinux/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-# pxelinux, 13.1.2, 20131015.1053.34
+# pxelinux, 13.1.3, 20140318.2329.20
 #
 
 # Template adding aii-pxelinux rpm to the configuration
 
 unique template quattor/aii/pxelinux/rpms;
 
-"/software/packages"=pkg_repl("aii-pxelinux","13.1.2-1","noarch");
+"/software/packages"=pkg_repl("aii-pxelinux","13.1.3-1","noarch");
diff --git a/quattor/aii/rpms.pan b/quattor/aii/rpms.pan
@@ -7,11 +7,11 @@
 # ${developer-info
 # ${author-info}
 # #
-      # server, 13.1.2, 20131015-1053
+      # server, 13.1.3, 20140318-2329
       #
 
 # Template adding aii-server rpm to the configuration
 
 unique template quattor/aii/rpms;
 
-"/software/packages"=pkg_repl("aii-server","13.1.2-1","noarch");
+"/software/packages"=pkg_repl("aii-server","13.1.3-1","noarch");
diff --git a/quattor/aii/schema.pan b/quattor/aii/schema.pan
@@ -8,7 +8,7 @@
 # ${developer-info
 # ${author-info}
 # #
-      # server, 13.1.2, 20131015-1053
+      # server, 13.1.3, 20140318-2329
       #
 unique template quattor/aii/schema;
 

diff --git a/quattor/client/rpms.pan b/quattor/client/rpms.pan
@@ -5,11 +5,9 @@
 
 template quattor/client/rpms;
 
-# Used to configure the appropriate repository
-variable QUATTOR_RELEASE ?= '13.1.2';
-variable QUATTOR_PACKAGES_VERSION ?= QUATTOR_RELEASE+"-1";
+include { 'quattor/client/version' };
 
-variable DEBUG = debug('Executing '+TEMPLATE+' for Quattor '+QUATTOR_RELEASE+' (pkg version='+QUATTOR_PACKAGES_VERSION+')');
+variable DEBUG = debug('Adding packages for Quattor '+QUATTOR_RELEASE+' (pkg version='+QUATTOR_PACKAGES_VERSION+')');
 
 # Quattor services.
 "/software/packages"=pkg_repl("ccm",        QUATTOR_PACKAGES_VERSION, "noarch");

diff --git a/quattor/client/version.pan b/quattor/client/version.pan
@@ -0,0 +1,9 @@
+
+template quattor/client/version;
+
+# Used to configure the appropriate repository
+# 13.1.3 release is based on 13.1.2 RPMs + a few modified ones
+variable QUATTOR_RELEASE ?= '13.1.3';
+variable QUATTOR_REPOSITORY_RELEASE ?= '13.1.2';
+variable QUATTOR_PACKAGES_VERSION ?= QUATTOR_REPOSITORY_RELEASE + "-1";
+