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/umd4/repository/config.pan

@@ -0,0 +1,45 @@
+# NOTE: This template should be the LAST thing included in a
+# machine profile.  If you include packages after this template
+# then they will not be "resolved" and SPMA will not function
+# correctly.
+
+unique template repository/config;
+
+include'pan/functions';
+
+include 'repository/snapshot/snapshot_variables';
+
+# Repositories related to base OS and quattor client (should be first)
+include'repository/config/os';
+
+# Quattor repositories
+include 'repository/config/quattor';
+
+# Local Repositories
+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"
+);
+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 the grid middleware)
+include if_exists('repository/config/grid');
+
+# Repositories related to Nagios
+include if (is_defined(REPOSITORY_CONFIG_NAGIOS)) if_exists(REPOSITORY_CONFIG_NAGIOS);
+
+# Register repository changes with yum based spma
+include 'components/spma/config';
+'/software/components/spma/register_change' = append('/software/repositories');
+
+# Cleanup repository information
+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;

clusters/misc/nagios/repository/config.pan

@@ -1,54 +1,38 @@
 unique template repository/config;
 
-include {'pan/functions'};
+include 'pan/functions';
 
 # NOTE: This template should be the LAST thing included in a
 # machine profile.  If you include packages after this template
 # then they will not be "resolved" and SPMA will not function
 # correctly.
 
 # Repositories related to base OS and quattor client (should be first)
-include {'repository/config/os'};
+include 'repository/config/os';
 
 # Quattor repository
-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 like a non UI LAL server)
-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);
-        } else {
-                return(null);
-        };
-};
-include { REPOSITORY_CONFIG_NAGIOS_INCLUDE };
+include if (is_defined(REPOSITORY_CONFIG_NAGIOS)) if_exists(REPOSITORY_CONFIG_NAGIOS);
 
 # Register repository changes with yum based spma
-'/software/components/spma/register_change' = {
-    if (is_defined(QUATTOR_RELEASE) && (QUATTOR_RELEASE >= '13.2')) {
-        append('/software/repositories');
-    } else {
-        SELF;
-    };
-};
+include 'components/spma/config';
+'/software/components/spma/register_change' = append('/software/repositories');
 
 # Cleanup repository information
-include { 'components/spma/repository_cleanup' };
+include 'components/spma/repository_cleanup';

clusters/openstack/icehouse/repository/config.pan

@@ -17,34 +17,24 @@ variable YUM_SITE_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
 variable SITE_REPOSITORY_LIST ?= list();
 variable SITE_REPOSITORY_CONFIG ?= dict();
 variable QUATTOR_REPOSITORY_LIST ?= list('snapshot/' + REPOSITORY_SNAPSHOT + '/Quattor-' + QUATTOR_RELEASE);
-variable DEBUG = debug('OS_REPOSITORY_LIST = ' + to_string(OS_REPOSITORY_LIST) + "\n" +
-                       'QUATTOR_REPOSITORY_LIST = ' + to_string(QUATTOR_REPOSITORY_LIST) + "\n" +
-                       'SITE_REPOSITORY_LIST = ' + to_string(SITE_REPOSITORY_LIST) + "\n" +
-                       'SITE_REPOSITORY_CONFIG = ' + to_string(SITE_REPOSITORY_CONFIG) + "\n");
+variable DEBUG = debug(
+    'OS_REPOSITORY_LIST = ' + to_string(OS_REPOSITORY_LIST) + "\n" +
+    'QUATTOR_REPOSITORY_LIST = ' + to_string(QUATTOR_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(QUATTOR_REPOSITORY_LIST);
 '/software/repositories' = add_repositories(SITE_REPOSITORY_LIST);
 '/software/repositories' = repository_config(SITE_REPOSITORY_CONFIG);
 
 # Repositories related to Nagios
-variable REPOSITORY_CONFIG_NAGIOS ?= null;
-variable REPOSITORY_CONFIG_NAGIOS_INCLUDE = {
-  if (exists(REPOSITORY_CONFIG_NAGIOS) && is_defined(REPOSITORY_CONFIG_NAGIOS)) {
-    REPOSITORY_CONFIG_NAGIOS;
-  } else {
-    null;
-  };
-};
-include REPOSITORY_CONFIG_NAGIOS_INCLUDE;
+include if (is_defined(REPOSITORY_CONFIG_NAGIOS)) if_exists(REPOSITORY_CONFIG_NAGIOS);
 
 # Register repository changes with yum based spma
-'/software/components/spma/register_change' = {
-    if (is_defined(QUATTOR_RELEASE) && (QUATTOR_RELEASE >= '13.2')) {
-        append('/software/repositories');
-    } else {
-        SELF;
-    };
-};
+include 'components/spma/config';
+'/software/components/spma/register_change' = append('/software/repositories');
 
 # Cleanup repository information
+include 'components/spma/config';
 include 'components/spma/repository_cleanup';