Update grid-related examples

- Use umd-4 rather than umd-3
- Use EL7 as the OS
- Remove obsolete machine type (LFC, WMS)
- Remove obsolete features

clusters/grid/umd4/cluster.build.properties

@@ -0,0 +1,2 @@
+cluster.pan.includes=sites/example grid/umd-4 os quattor/23.9.0-rc1 standard 
+cluster.pan.dep.ignore=""

clusters/grid/umd3/profiles/se-dpm-disk.example.org.pan → clusters/grid/umd4/profiles/se-dpm-disk.example.org.pan

@@ -15,5 +15,3 @@ include 'machine-types/example/se_dpm';
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
-
-

clusters/grid/umd3/profiles/se-dpm-disk2.example.org.pan → clusters/grid/umd4/profiles/se-dpm-disk2.example.org.pan

@@ -15,5 +15,3 @@ include 'machine-types/example/se_dpm';
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
-
-

clusters/grid/umd3/profiles/se-dpm-server.example.org.pan → clusters/grid/umd4/profiles/se-dpm-server.example.org.pan

@@ -15,17 +15,16 @@ include 'machine-types/example/se_dpm';
 #"/software/components/accounts/rootpwd" = "$1$gMlULQt/$SEHi2bFOtlEwv/qMj4ZBP0";
 
 # Tune MySQL parameters (recommended)
-'/software/components/mysql/servers/' = {
-  SELF[FULL_HOSTNAME]['options'] = nlist(
-        'innodb_buffer_pool_size','2048M',
-        'innodb_additional_mem_pool_size','256M',
-  );
-  SELF;
+include 'components/mysql/config';
+'/software/components/mysql/servers' = {
+    SELF[FULL_HOSTNAME]['options'] = dict(
+        'innodb_buffer_pool_size', '2048M',
+        'innodb_additional_mem_pool_size', '256M',
+    );
+    SELF;
 };
 
 # 
 # software repositories
 #
 include PKG_REPOSITORY_CONFIG;
-
-

clusters/grid/umd3/repository/config.pan → clusters/grid/umd4/repository/config.pan

@@ -5,44 +5,47 @@
 
 unique template repository/config;
 
-include {'pan/functions'};
+include'pan/functions';
 
-include { 'repository/snapshot/snapshot_variables' };
+include 'repository/snapshot/snapshot_variables';
 
 # Repositories related to base OS and quattor client (should be first)
-include {'repository/config/os'};
+include'repository/config/os';
 
 # Quattor repositories
-include { 'repository/config/quattor' };
+include 'repository/config/quattor';
 
 # Local Repositories
 variable YUM_SITE_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
 variable SITE_REPOSITORY_LIST ?= list();
-variable SITE_REPOSITORY_CONFIG ?= nlist();
-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");
-include {'quattor/functions/repository'};
+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"
+);
+include'quattor/functions/repository';
 #'/software/repositories' = add_repositories(SITE_REPOSITORY_LIST,YUM_SITE_SNAPSHOT_NS);
 '/software/repositories' = add_repositories(SITE_REPOSITORY_LIST);
 '/software/repositories' = repository_config(SITE_REPOSITORY_CONFIG);
 
 # Repositories related to grid middleware
 # Only if it can be found in the loadpath (else this is a machine not running gLite
-include { if_exists('repository/config/grid') };
+include if_exists('repository/config/grid');
 
 # Repositories related to Nagios
 variable REPOSITORY_CONFIG_NAGIOS ?= null;
 variable REPOSITORY_CONFIG_NAGIOS_INCLUDE = {
         if (exists(REPOSITORY_CONFIG_NAGIOS) && is_defined(REPOSITORY_CONFIG_NAGIOS)) {
-                return(REPOSITORY_CONFIG_NAGIOS);
+                REPOSITORY_CONFIG_NAGIOS;
         } else {
-                return(null);
+                null;
         };
 };
-include { REPOSITORY_CONFIG_NAGIOS_INCLUDE };
+include REPOSITORY_CONFIG_NAGIOS_INCLUDE;
 
 # Register repository changes with yum based spma
+include 'components/spma/config';
 '/software/components/spma/register_change' = {
     if (is_defined(QUATTOR_RELEASE) && (QUATTOR_RELEASE >= '13.2')) {
         append('/software/repositories');
@@ -52,4 +55,4 @@ include { REPOSITORY_CONFIG_NAGIOS_INCLUDE };
 };
 
 # Cleanup repository information
-include { 'components/spma/repository_cleanup' };
+include 'components/spma/repository_cleanup';

clusters/grid/umd3/site/cluster_info.pan → 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 = '/yum/snapshots/' + YUM_SNAPSHOT_DATE;
 
 # Set to true to enable MPI support
 variable ENABLE_MPI ?= false;
@@ -41,6 +41,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;

sites/example/site/glite/dpm_config.pan

@@ -4,6 +4,9 @@
 
 template site/glite/dpm_config;
 
+# DPM vrsion to use by default
+variable DPM_VERSION ?= '1.8.10';
+
 # Just for convenience, this variable is not used by standard templates
 variable DPM_HEAD_NODE ?= 'se-dpm-server.example.org';
 

sites/example/site/global_variables.pan

@@ -19,8 +19,8 @@ include 'pan/functions';
 final variable DEFAULT_DOMAIN = "example.org";
 
 final variable HOSTNAME = hostname_from_object();
-final variable DOMAIN = domain_from_object(DEFAULT_DOMAIN);
-final variable FULL_HOSTNAME = full_hostname_from_object(DEFAULT_DOMAIN);
+final variable DOMAIN = domain_from_object();
+final variable FULL_HOSTNAME = OBJECT;
 
 # Define the nameservers to use for the site.
 final variable NAMESERVERS = list("134.158.120.3");

sites/example/site/os/version_db.pan

@@ -13,33 +13,33 @@ unique template site/os/version_db;
 # site-wide definition of the variable (in this template).
 
 variable YUM_OS_DISTRIBUTION = {
-  # Default per OS version
-  SELF['el7'] = 'centos71';
+    # Default per OS version
+    SELF['el7'] = 'centos71';
 
-  # Explicit value per host name
-  SELF['ui.example.org'] = 'centos7';
+    # Explicit value per host name
+    SELF['ui.example.org'] = 'centos7';
 
-  SELF;
+    SELF;
 };
 
 
 variable OS_VERSION = dict(
-  escape("cream.example.org"),		"sl640-x86_64",
-  escape("dcache-head.example.org"),	"sl640-i386",
-  escape("dcache-pool.example.org"),	"sl640-i386",
-  escape("hydra.example.org"),		"sl640-x86_64",
-  escape("lfc.example.org"),		"sl640-x86_64",
-  escape("mon.example.org"),		"sl640-x86_64",
-  escape("ui.example.org"),		"el7x-x86_64",
-  escape("wmslb.example.org"),		"sl640-x86_64",
-  escape("wn2.example.org"),		"sl640-x86_64",
-  escape("xen-guest.example.org"),	"sl640-x86_64",
-  escape("xen-host.example.org"),	"sl640-x86_64",
-
-  escape("nagios-server.example.org"),	"sl550-x86_64",
-  escape("nagios-master.example.org"),		"sl550-x86_64",
-  escape("nagios-slave-A.example.org"),		"sl550-x86_64",
-  escape("nagios-slave-B.example.org"),		"sl550-x86_64",
+    escape("cream.example.org"), "el7x-x86_64",
+    escape("dcache-head.example.org"), "el7x-i386",
+    escape("dcache-pool.example.org"), "el7x-i386",
+    escape("hydra.example.org"), "el7x-x86_64",
+    escape("lfc.example.org"), "el7x-x86_64",
+    escape("mon.example.org"), "el7x-x86_64",
+    escape("ui.example.org"), "el7x-x86_64",
+    escape("wmslb.example.org"), "el7x-x86_64",
+    escape("wn2.example.org"), "el7x-x86_64",
+    escape("xen-guest.example.org"), "el7x-x86_64",
+    escape("xen-host.example.org"), "el7x-x86_64",
+
+    escape("nagios-server.example.org"), "el7x-x86_64",
+    escape("nagios-master.example.org"), "el7x-x86_64",
+    escape("nagios-slave-A.example.org"), "el7x-x86_64",
+    escape("nagios-slave-B.example.org"), "el7x-x86_64",
 );
 
 

sites/example/vo/site/cms.pan

@@ -2,10 +2,11 @@ structure template vo/site/cms;
 
 # Disable some roles not used at T2s
 "voms_mappings" ?= list(
-    nlist('fqan', '/cms/Role=t1production',
-          'enabled', false,
-         ),
-    nlist('fqan', '/cms/Role=hit1production',
-          'enabled', false,
-         ),
+    dict(
+        'description', 'production',
+        'fqan', '/cms/Role=t1production',
+        'enabled', false,
+        'suffix', 'p',
+        'suffix2', 'p',
+    ),
 );