quattor · jrha · Jun 12, 2017
diff --git a/clusters/grid/umd4/profiles/se-dpm-disk.example.org.pan b/clusters/grid/umd4/profiles/se-dpm-disk.example.org.pan
@@ -11,7 +11,7 @@ variable DPM_CONFIG_SITE ?= 'site/glite/dpm_config';
 # Configure as a DPM disk server
 include 'machine-types/example/se_dpm';
 
-# 
+#
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/grid/umd4/profiles/se-dpm-disk2.example.org.pan b/clusters/grid/umd4/profiles/se-dpm-disk2.example.org.pan
@@ -11,7 +11,7 @@ variable DPM_CONFIG_SITE ?= 'site/glite/dpm_config';
 # Configure as a DPM disk server
 include 'machine-types/example/se_dpm';
 
-# 
+#
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/grid/umd4/profiles/se-dpm-server.example.org.pan b/clusters/grid/umd4/profiles/se-dpm-server.example.org.pan
@@ -16,6 +16,7 @@ include 'machine-types/example/se_dpm';
 
 # Tune MySQL parameters (recommended)
 include 'components/mysql/config';
+
 '/software/components/mysql/servers' = {
     SELF[FULL_HOSTNAME]['options'] = dict(
         'innodb_buffer_pool_size', '2048M',
@@ -24,7 +25,7 @@ include 'components/mysql/config';
     SELF;
 };
 
-# 
+#
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/grid/umd4/profiles/ui.example.org.pan b/clusters/grid/umd4/profiles/ui.example.org.pan
@@ -1,6 +1,6 @@
-object template ui.example.org;
-
-include 'machine-types/grid/ui';
-
-include PKG_REPOSITORY_CONFIG;
-
+object template ui.example.org;
+
+include 'machine-types/grid/ui';
+
+include PKG_REPOSITORY_CONFIG;
+
diff --git a/clusters/grid/umd4/site/cluster_info.pan b/clusters/grid/umd4/site/cluster_info.pan
@@ -15,7 +15,7 @@ variable OS_FLAVOUR_ENABLED ?= true;
 
 # YUM Repository snapshots
 variable YUM_SNAPSHOT_DATE ?= '20140304';
-variable AII_OSINSTALL_ROOT = '/yum/snapshots/' + YUM_SNAPSHOT_DATE;
+variable AII_OSINSTALL_ROOT = format('/yum/snapshots/%s', YUM_SNAPSHOT_DATE);
 
 # Set to true to enable MPI support
 variable ENABLE_MPI ?= false;

diff --git a/clusters/misc/nagios/repository/config.pan b/clusters/misc/nagios/repository/config.pan
@@ -18,9 +18,10 @@ variable YUM_SITE_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
 variable SITE_REPOSITORY_LIST ?= list();
 variable SITE_REPOSITORY_CONFIG ?= dict();
 variable DEBUG = debug(
-    'OS_REPOSITORY_LIST = ' + to_string(OS_REPOSITORY_LIST) + "\n" +
-    'SITE_REPOSITORY_LIST = ' + to_string(SITE_REPOSITORY_LIST) + "\n" +
-    'SITE_REPOSITORY_CONFIG = ' + to_string(SITE_REPOSITORY_CONFIG) + "\n"
+    "OS_REPOSITORY_LIST = %s\nSITE_REPOSITORY_LIST = %s\nSITE_REPOSITORY_CONFIG = %s",
+    OS_REPOSITORY_LIST,
+    SITE_REPOSITORY_LIST,
+    SITE_REPOSITORY_CONFIG,
 );
 include 'quattor/functions/repository';
 '/software/repositories' = add_repositories(SITE_REPOSITORY_LIST);

diff --git a/clusters/misc/nagios/site/cluster_info.pan b/clusters/misc/nagios/site/cluster_info.pan
@@ -15,7 +15,7 @@ variable OS_FLAVOUR_ENABLED ?= true;
 
 # YUM Repository snapshots
 variable YUM_SNAPSHOT_DATE ?= '20140304';
-variable AII_OSINSTALL_ROOT = '/yum/snapshots/'+YUM_SNAPSHOT_DATE;
+variable AII_OSINSTALL_ROOT = format('/yum/snapshots/', YUM_SNAPSHOT_DATE);
 
 # Set to true if you want to deploy machines in these clusster with an
 # AII server running Quattor 13.1.x.
@@ -38,6 +38,6 @@ variable PKG_REPOSITORY_CONFIG ?= 'repository/config';
 #
 # set root password on machines
 #
-include { 'components/accounts/config' };
+include 'components/accounts/config';
 "/software/components/accounts/rootpwd" ?= "$1$57qRuCXe$NPngMkg4BrLBf5hfJzJh21";
 "/software/components/accounts/shadowpwd" = true;
diff --git a/non-grid/basic/common/opennebula/common.pan b/non-grid/basic/common/opennebula/common.pan
@@ -1,16 +1,17 @@
 unique template common/opennebula/common;
 
+include 'components/useraccess/config';
+
 variable OPENNEBULA_VERSION ?= '4.12.1';
-'/software/packages' = pkg_repl('opennebula*', format("%s-*",OPENNEBULA_VERSION), 'x86_64');
+'/software/packages' = pkg_repl('opennebula*', format("%s-*", OPENNEBULA_VERSION), 'x86_64');
 
 variable OS_REPOSITORY_LIST = {
     append('opennebula');
 };
 
 "/software/components/useraccess/users/oneadmin/ssh_keys" = {
-     foreach(idx;pubkey;ONEADMIN_PUBKEYS) {
-         append(pubkey);
-     };
-     SELF;
+    foreach(idx; pubkey; ONEADMIN_PUBKEYS) {
+        append(pubkey);
+    };
+    SELF;
 };
-
diff --git a/non-grid/basic/common/opennebula/mysql.pan b/non-grid/basic/common/opennebula/mysql.pan
@@ -1,10 +1,11 @@
 unique template common/opennebula/mysql;
 
+include 'components/chkconfig/config';
+include 'components/mysql/config';
+
 prefix "/software/packages";
 "{mysql-server}" = dict();
 
-include 'components/mysql/config';
-
 prefix  "/software/components/mysql";
 "serviceName" = {
     if (RPM_BASE_FLAVOUR_VERSIONID == 7) {
@@ -21,9 +22,9 @@ prefix "/software/components/mysql/servers/one";
 prefix "/software/components/mysql/databases/opennebula";
 "server" = "one";
 "users/oneadmin/password" = OPENNEBULA_MYSQL_ONEADMIN;
-"users/oneadmin/rights" = list("ALL PRIVILEGES"); 
+"users/oneadmin/rights" = list("ALL PRIVILEGES");
 "createDb" = false; # if false, run script
 "initScript/file" = "/dev/null";
 
 prefix "/software/components/chkconfig/service";
-"mysqld" = dict("on", "","startstop", true);
+"mysqld" = dict("on", "", "startstop", true);
diff --git a/non-grid/basic/common/opennebula/node.pan b/non-grid/basic/common/opennebula/node.pan
@@ -1,7 +1,7 @@
 unique template common/opennebula/node;
 
+include 'components/filecopy/config';
 include 'components/opennebula/sudo';
-include 'components/useraccess/config';
 
 prefix "/software/packages";
 "{opennebula-node-kvm}" = dict();
@@ -11,10 +11,15 @@ prefix "/software/packages";
 '/software/components/filecopy/services' = {
     if (is_defined(CEPH_LIBVIRT_UUID)) {
         SELF[escape("/var/lib/one/templates/secret/secret_ceph.xml")] = dict(
-            'config',format("<secret ephemeral='no' private='no'><uuid>%s</uuid><usage type='ceph'><name>%s secret</name></usage></secret>",
-                CEPH_LIBVIRT_UUID, "client.libvirt"),
-            'owner','oneadmin:oneadmin',
-            'perms', '0600');
-   };
-   SELF;
+            'config', join("", list(
+                "<secret ephemeral='no' private='no'>",
+                format("<uuid>%s</uuid>", CEPH_LIBVIRT_UUID),
+                format("<usage type='ceph'><name>%s secret</name></usage>", "client.libvirt"),
+                "</secret>",
+            )),
+            'owner', 'oneadmin:oneadmin',
+            'perms', '0600',
+        );
+    };
+    SELF;
 };
diff --git a/non-grid/basic/common/opennebula/one_auth.pan b/non-grid/basic/common/opennebula/one_auth.pan
@@ -1,5 +1,7 @@
 unique template common/opennebula/one_auth;
 
+include 'components/filecopy/config';
+
 '/software/components/filecopy/services/{/var/lib/one/.one/one_auth.new}' = dict(
     'config', format("oneadmin:%s\n", OPENNEBULA_ONEADMIN),
     'owner', 'oneadmin:oneadmin',

diff --git a/non-grid/basic/common/opennebula/oneadmin.pan b/non-grid/basic/common/opennebula/oneadmin.pan
@@ -9,7 +9,7 @@ prefix '/software/components/accounts';
 "users/oneadmin" = dict(
     "uid", 9869,
     "groups", list("oneadmin"),
-    "comment","oneadmin",
+    "comment", "oneadmin",
     "shell", "/bin/bash",
     "homeDir", "/var/lib/one",
     "createHome", true,

diff --git a/sites/example/drivers/dell_openmanage.pan b/sites/example/drivers/dell_openmanage.pan
@@ -1,95 +1,88 @@
 unique template drivers/dell_openmanage;
 
-"/software/packages"={
-	kernel="";
-	if(KERNEL_VARIANT!="") kernel="kernel-" + KERNEL_VARIANT + "-devel"
-	else kernel="kernel-devel";
-	pkg_repl(kernel,KERNEL_VERSION_NUM,PKG_ARCH_KERNEL);
-	};
+include 'components/filecopy/config';
+
+"/software/packages" = {
+    kernel = "";
+    if (KERNEL_VARIANT != "") kernel = "kernel-" + KERNEL_VARIANT + "-devel"
+    else kernel = "kernel-devel";
+    pkg_repl(kernel, KERNEL_VERSION_NUM, PKG_ARCH_KERNEL);
+};
 
 #install RPMs
 #
 # OS Packages necessaires
 #
-#"/software/packages"=pkg_repl("libxml2","2.6.26-2.1.2.7","i386");
-#"/software/packages"=pkg_repl("zlib","1.2.3-3","i386");
-#"/software/packages"=pkg_repl("compat-libstdc33","3.2.3-61","i386");
-#"/software/packages"=pkg_repl("pam","0.99.6.2-3.27.el5","i386");
-#"/software/packages"=pkg_repl("audit-libs","1.6.5-9.el5","i386");
-#"/software/packages"=pkg_repl("cracklib","2.8.9-3.3","i386");
-#"/software/packages"=pkg_repl("libselinux","1.33.4-5.el5","i386");
-#"/software/packages"=pkg_repl("libsepol","1.15.2-1.el5","i386");
-#"/software/packages"=pkg_repl("ncurses","5.5-24.20060715","i386");
+#"/software/packages" = pkg_repl("libxml2", "2.6.26-2.1.2.7", "i386");
+#"/software/packages" = pkg_repl("zlib", "1.2.3-3", "i386");
+#"/software/packages" = pkg_repl("compat-libstdc33", "3.2.3-61", "i386");
+#"/software/packages" = pkg_repl("pam", "0.99.6.2-3.27.el5", "i386");
+#"/software/packages" = pkg_repl("audit-libs", "1.6.5-9.el5", "i386");
+#"/software/packages" = pkg_repl("cracklib", "2.8.9-3.3", "i386");
+#"/software/packages" = pkg_repl("libselinux", "1.33.4-5.el5", "i386");
+#"/software/packages" = pkg_repl("libsepol", "1.15.2-1.el5", "i386");
+#"/software/packages" = pkg_repl("ncurses", "5.5-24.20060715", "i386");
 
 #
 # Dell OpenManage Version
 #
 
-"/software/packages"=pkg_add("srvadmin-omilcore","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-syscheck","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-deng","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racser","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-omauth","5.5.0-364.rhel4","i386");
-"/software/packages"=pkg_add("srvadmin-omacore","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-jre","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-odf","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racadm4","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racsvc","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-ipmi","5.5.0-364.rhel4","i386");
-"/software/packages"=pkg_add("srvadmin-hapi","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-rac5-components","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-isvc","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-rac3-components","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-rac4-components","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-cm","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-iws","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-old","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-omhip","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racadm5","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racdrsc3","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racdrsc4","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racdrsc5","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racser-devel","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-racvnc","5.5.0-364","i386");
-"/software/packages"=pkg_add("srvadmin-storage","5.5.0-364","i386");
+"/software/packages" = pkg_add("srvadmin-omilcore", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-syscheck", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-deng", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racser", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-omauth", "5.5.0-364.rhel4", "i386");
+"/software/packages" = pkg_add("srvadmin-omacore", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-jre", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-odf", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racadm4", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racsvc", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-ipmi", "5.5.0-364.rhel4", "i386");
+"/software/packages" = pkg_add("srvadmin-hapi", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-rac5-components", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-isvc", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-rac3-components", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-rac4-components", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-cm", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-iws", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-old", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-omhip", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racadm5", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racdrsc3", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racdrsc4", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racdrsc5", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racser-devel", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-racvnc", "5.5.0-364", "i386");
+"/software/packages" = pkg_add("srvadmin-storage", "5.5.0-364", "i386");
 
 #installation de dkms
-"/software/packages"=pkg_add("dkms","2.0.19-1","noarch");
+"/software/packages" = pkg_add("dkms", "2.0.19-1", "noarch");
 
 
 #openipmi installation:
-"/software/packages"=pkg_add("openipmi","33.13.RHEL4-1dkms","noarch");
+"/software/packages" = pkg_add("openipmi", "33.13.RHEL4-1dkms", "noarch");
 
 #driver installation
-"/software/packages"=pkg_add("megaraid_sas","v00.00.03.21-4","noarch");
+"/software/packages" = pkg_add("megaraid_sas", "v00.00.03.21-4", "noarch");
 
 
 #Install and run setup script
-variable CONFIG_FILE="/usr/bin/setup_dell_openmanage.sh";
-variable RESTART_COMMAND=CONFIG_FILE;
-variable MACHINE_KERNEL_VERSION={
-	if(KERNEL_VARIANT!="") return(KERNEL_VERSION_NUM+KERNEL_VARIANT)
-	else return(KERNEL_VERSION_NUM);
+variable CONFIG_FILE = "/usr/bin/setup_dell_openmanage.sh";
+variable RESTART_COMMAND = CONFIG_FILE;
+variable MACHINE_KERNEL_VERSION = {
+    if (KERNEL_VARIANT != "") return(KERNEL_VERSION_NUM + KERNEL_VARIANT)
+    else return(KERNEL_VERSION_NUM);
 };
 
-
-variable CONTENTS=<<EOF;
-#!/bin/bash
-#build driver for the SAS 3085 card
-#  dkms build -m megaraid_sas -v v00.00.03.21 -k 2.6.9-67.0.4.ELlargesmp
-#  dkms install -m megaraid_sas -v v00.00.03.21 -k 2.6.9-67.0.4.ELlargesmp
-EOF
-variable CONTENTS=CONTENTS+
-	"#/usr/sbin/dkms build -k " + MACHINE_KERNEL_VERSION +" -m megaraid_sas -v v00.00.03.21\n" +
-	"#/usr/sbin/dkms install -k " + MACHINE_KERNEL_VERSION +" megaraid_sas -v v00.00.03.21\n";
-
 #copy the file and run it
-"/software/components/filecopy/services" = npush(escape(CONFIG_FILE),
-		nlist("config",CONTENTS,
-	              "owner","root",
-	              "perms","0755",
-	              "restart",RESTART_COMMAND)
-		);
+"/software/components/filecopy/services" = npush(escape(CONFIG_FILE), dict(
+    "config", substitute(file_contents('drivers/dell_openmanage_sas_driver.sh'), dict(
+        'kernel', MACHINE_KERNEL_VERSION,
+    )),
+    "owner", "root",
+    "perms", "0755",
+    "restart", RESTART_COMMAND,
+));
 
 
 #variable DEBUG=error("kernel : " + KERNEL_VERSION_NUM + " -- variante : " + KERNEL_VARIANT);
diff --git a/sites/example/drivers/dell_openmanage_sas_driver.sh b/sites/example/drivers/dell_openmanage_sas_driver.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+#build driver for the SAS 3085 card
+#  dkms build -m megaraid_sas -v v00.00.03.21 -k 2.6.9-67.0.4.ELlargesmp
+#  dkms install -m megaraid_sas -v v00.00.03.21 -k 2.6.9-67.0.4.ELlargesmp
+#/usr/sbin/dkms build -k ${kernel} -m megaraid_sas -v v00.00.03.21
+#/usr/sbin/dkms install -k ${kernel} megaraid_sas -v v00.00.03.21
diff --git a/sites/example/hardware/machine/200/48/Dell2/32.pan b/sites/example/hardware/machine/200/48/Dell2/32.pan
@@ -9,16 +9,23 @@ structure template hardware/machine/200/48/Dell2/32;
 "location" = "200/48/Dell2/32";
 "serialnumber" = "DPVTL2J";
 
-"cpu" = list(create("hardware/cpu/intel/xeon_e5140"),
-             create("hardware/cpu/intel/xeon_e5140"));
-
-"harddisks" = nlist("sda", create("hardware/harddisk/sata",
-				  "capacity", 80*GB));
-
-"ram" = list(create("hardware/ram/generic", "size", 8192*MB));
-
-"cards/nic" = nlist("eth0",create("hardware/nic/by_driver/tg3"),
-                    "eth1",create("hardware/nic/by_driver/tg3"));
+"cpu" = list(
+    create("hardware/cpu/intel/xeon_e5140"),
+    create("hardware/cpu/intel/xeon_e5140"),
+);
+
+"harddisks" = dict(
+    "sda", create("hardware/harddisk/sata", "capacity", 80 * GB),
+);
+
+"ram" = list(
+    create("hardware/ram/generic", "size", 8192 * MB),
+);
+
+"cards/nic" = dict(
+    "eth0", create("hardware/nic/by_driver/tg3"),
+    "eth1", create("hardware/nic/by_driver/tg3"),
+);
 
 "cards/nic/eth0/hwaddr" = "00:15:c5:eb:5e:88";
 "cards/nic/eth1/hwaddr" = "00:15:c5:eb:5e:86";