From 479be619a4481aa90d5f13ae030e1277da7bc2f5 Mon Sep 17 00:00:00 2001
From: James Adams <james.adams@stfc.ac.uk>
Date: Fri, 19 Feb 2016 16:03:27 +0000
Subject: [PATCH] AII templates for tag aii-16.2.0

---
 quattor/aii/config.pan               | 2 +-
 quattor/aii/dhcp/config.pan          | 2 +-
 quattor/aii/dhcp/rpms.pan            | 4 ++--
 quattor/aii/dhcp/schema.pan          | 2 +-
 quattor/aii/ks/config.pan            | 2 +-
 quattor/aii/ks/rpms.pan              | 4 ++--
 quattor/aii/ks/schema.pan            | 2 +-
 quattor/aii/ks/variants/fedora14.pan | 2 +-
 quattor/aii/ks/variants/sl6.pan      | 2 +-
 quattor/aii/pxelinux/config.pan      | 2 +-
 quattor/aii/pxelinux/rpms.pan        | 4 ++--
 quattor/aii/pxelinux/schema.pan      | 2 +-
 quattor/aii/rpms.pan                 | 4 ++--
 quattor/aii/schema.pan               | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/quattor/aii/config.pan b/quattor/aii/config.pan
index b0883e1cc..016139953 100644
--- a/quattor/aii/config.pan
+++ b/quattor/aii/config.pan
@@ -15,7 +15,7 @@
 #
 
 # #
-# server, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# server, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 #
 # 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
index 7d0bb6374..d9f529215 100644
--- a/quattor/aii/dhcp/config.pan
+++ b/quattor/aii/dhcp/config.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# dhcp, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# dhcp, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 template quattor/aii/dhcp/config;
 
diff --git a/quattor/aii/dhcp/rpms.pan b/quattor/aii/dhcp/rpms.pan
index 86ea17d7c..7e3918310 100644
--- a/quattor/aii/dhcp/rpms.pan
+++ b/quattor/aii/dhcp/rpms.pan
@@ -14,11 +14,11 @@
 #
 
 # #
-# dhcp, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# dhcp, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template adding aii-dhcp rpm to the configuration
 
 unique template quattor/aii/dhcp/rpms;
 
-"/software/packages"=pkg_repl("aii-dhcp","16.2.0-rc3_1","noarch");
+"/software/packages"=pkg_repl("aii-dhcp","16.2.0-1","noarch");
diff --git a/quattor/aii/dhcp/schema.pan b/quattor/aii/dhcp/schema.pan
index 6494dea9c..4c9fa7def 100644
--- a/quattor/aii/dhcp/schema.pan
+++ b/quattor/aii/dhcp/schema.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# dhcp, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# dhcp, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 unique template quattor/aii/dhcp/schema;
diff --git a/quattor/aii/ks/config.pan b/quattor/aii/ks/config.pan
index a39a7bdab..985a60b9d 100644
--- a/quattor/aii/ks/config.pan
+++ b/quattor/aii/ks/config.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# ks, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# ks, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template containing the Kickstart-related configuration and default
diff --git a/quattor/aii/ks/rpms.pan b/quattor/aii/ks/rpms.pan
index 411a4d0ca..b0d88c7dc 100644
--- a/quattor/aii/ks/rpms.pan
+++ b/quattor/aii/ks/rpms.pan
@@ -14,11 +14,11 @@
 #
 
 # #
-# ks, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# ks, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template adding aii-ks rpm to the configuration
 
 unique template quattor/aii/ks/rpms;
 
-"/software/packages"=pkg_repl("aii-ks","16.2.0-rc3_1","noarch");
+"/software/packages"=pkg_repl("aii-ks","16.2.0-1","noarch");
diff --git a/quattor/aii/ks/schema.pan b/quattor/aii/ks/schema.pan
index da112b004..1a76d8e8c 100644
--- a/quattor/aii/ks/schema.pan
+++ b/quattor/aii/ks/schema.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# ks, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# ks, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 # Structure for the component generating kickstart files.
 
diff --git a/quattor/aii/ks/variants/fedora14.pan b/quattor/aii/ks/variants/fedora14.pan
index 1045a9d05..35c7af798 100644
--- a/quattor/aii/ks/variants/fedora14.pan
+++ b/quattor/aii/ks/variants/fedora14.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# ks, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# ks, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template containing OS configuration and default values.
diff --git a/quattor/aii/ks/variants/sl6.pan b/quattor/aii/ks/variants/sl6.pan
index 3ad88017c..4d6cd9a0e 100644
--- a/quattor/aii/ks/variants/sl6.pan
+++ b/quattor/aii/ks/variants/sl6.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# ks, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# ks, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template containing OS configuration and default values.
diff --git a/quattor/aii/pxelinux/config.pan b/quattor/aii/pxelinux/config.pan
index f6e1e5231..3a8230c9d 100644
--- a/quattor/aii/pxelinux/config.pan
+++ b/quattor/aii/pxelinux/config.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# pxelinux, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# pxelinux, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 template quattor/aii/pxelinux/config;
 
diff --git a/quattor/aii/pxelinux/rpms.pan b/quattor/aii/pxelinux/rpms.pan
index f356b3dcf..d45c80ae7 100644
--- a/quattor/aii/pxelinux/rpms.pan
+++ b/quattor/aii/pxelinux/rpms.pan
@@ -14,11 +14,11 @@
 #
 
 # #
-# pxelinux, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# pxelinux, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template adding aii-pxelinux rpm to the configuration
 
 unique template quattor/aii/pxelinux/rpms;
 
-"/software/packages"=pkg_repl("aii-pxelinux","16.2.0-rc3_1","noarch");
+"/software/packages"=pkg_repl("aii-pxelinux","16.2.0-1","noarch");
diff --git a/quattor/aii/pxelinux/schema.pan b/quattor/aii/pxelinux/schema.pan
index 4dcf51d8f..02b66f7ca 100644
--- a/quattor/aii/pxelinux/schema.pan
+++ b/quattor/aii/pxelinux/schema.pan
@@ -14,7 +14,7 @@
 #
 
 # #
-# pxelinux, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# pxelinux, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 unique template quattor/aii/pxelinux/schema;
 
diff --git a/quattor/aii/rpms.pan b/quattor/aii/rpms.pan
index dbcdbbbf9..e316de65c 100644
--- a/quattor/aii/rpms.pan
+++ b/quattor/aii/rpms.pan
@@ -14,11 +14,11 @@
 #
 
 # #
-# server, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# server, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 
 # Template adding aii-server rpm to the configuration
 
 unique template quattor/aii/rpms;
 
-"/software/packages"=pkg_repl("aii-server","16.2.0-rc3_1","noarch");
+"/software/packages"=pkg_repl("aii-server","16.2.0-1","noarch");
diff --git a/quattor/aii/schema.pan b/quattor/aii/schema.pan
index 947e2f50e..2448be422 100644
--- a/quattor/aii/schema.pan
+++ b/quattor/aii/schema.pan
@@ -15,7 +15,7 @@
 #
 
 # #
-# server, 16.2.0-rc3, rc3_1, 2016-02-18T17:08:35Z
+# server, 16.2.0, 1, 2016-02-19T16:03:19Z
 #
 unique template quattor/aii/schema;