Skip to content

Commit

Permalink
Merge pull request #1 from quattor/emi-3
Browse files Browse the repository at this point in the history 
Emi 3
  • Loading branch information
@Pansanel
Pansanel committed Feb 17, 2014
2 parents 2dc6fc1 + d48c350 commit 2a822fb
Show file tree
Hide file tree
Showing 36 changed files with 516 additions and 26 deletions.
2 changes: 1 addition & 1 deletion common/classads/config.pan
View file
Expand Up @@ -3,7 +3,7 @@
unique template common/classads/config;

# Add classads RPMs
include { 'common/classads/rpms/config' };
include { 'common/classads/rpms/config' + RPMS_SUFFIX };

variable LDCONF_ARCH_DIR = if (PKG_ARCH_GLITE == 'x86_64') {
return('lib64');
Expand Down
1 change: 1 addition & 0 deletions common/classads/rpms/config-yd.pan
View file
@@ -0,0 +1 @@
unique template common/classads/rpms/config-yd;
3 changes: 3 additions & 0 deletions common/glexec/wn/rpms/config-yd.pan
View file
@@ -0,0 +1,3 @@
unique template common/glexec/wn/rpms/config-yd;

'/software/packages/{glexec-wn}' ?= nlist();
2 changes: 1 addition & 1 deletion common/glexec/wn/service.pan
View file
@@ -1,7 +1,7 @@
unique template common/glexec/wn/service;

# Add RPMs
include { 'common/glexec/wn/rpms/config' };
include { 'common/glexec/wn/rpms/config' + RPMS_SUFFIX };

# Modify the loadable library path.
include { 'common/ldconf/config' };
Expand Down
2 changes: 1 addition & 1 deletion common/gsissh/client/config.pan
View file
@@ -1,6 +1,6 @@
unique template common/gsissh/client/config;

include { 'common/gsissh/client/rpms/config' };
include { 'common/gsissh/client/rpms/config' + RPMS_SUFFIX };

# ----------------------------------------------------------------------------
# gsissh
Expand Down
4 changes: 4 additions & 0 deletions common/gsissh/client/rpms/config-yd.pan
View file
@@ -0,0 +1,4 @@
unique template common/gsissh/client/rpms/config-yd;

'/software/packages/{gsi-openssh}' ?= nlist();
'/software/packages/{gsi-openssh-clients}' ?= nlist();
2 changes: 1 addition & 1 deletion common/mkgridmap/base.pan
View file
Expand Up @@ -2,7 +2,7 @@
unique template common/mkgridmap/base;

# Add RPMs
include { 'common/mkgridmap/rpms' };
include { 'common/mkgridmap/rpms' + RPMS_SUFFIX };

# Hack to workaround an undefined conf path listen by ncm-mkgridmap
'/system/edg/config/EDG_LOCATION' = 'Not.used.anymore';
Expand Down
3 changes: 3 additions & 0 deletions common/mkgridmap/rpms-yd.pan
View file
@@ -0,0 +1,3 @@
unique template common/mkgridmap/rpms-yd;

'/software/packages/{edg-mkgridmap}' ?= nlist();
41 changes: 29 additions & 12 deletions common/mpi/rpms/config.pan
View file
Expand Up @@ -7,23 +7,28 @@ variable CE_TORQUE ?= true;
# mpiexec for torque/mpich which uses TM libraries
'/software/packages' = {
if (CE_TORQUE) {
pkg_repl('mpiexec',MPI_MPIEXEC_VERSION_FULL,PKG_ARCH_MPIEXEC);
if(is_defined(QUATTOR_SPMA_YUM) && QUATTOR_SPMA_YUM){
SELF['mpiexec'] = nlist();
SELF;
}else{
pkg_repl('mpiexec',MPI_MPIEXEC_VERSION_FULL,PKG_ARCH_MPIEXEC);
};
} else {
SELF;
};
};

include {
if(MPI_USE_MPICH) {
return("common/mpi/rpms/mpich");
return("common/mpi/rpms/mpich"+RPMS_SUFFIX);
} else {
return(null);
};
};

include {
if(MPI_USE_MPICH2) {
return("common/mpi/rpms/mpich2");
return("common/mpi/rpms/mpich2"+RPMS_SUFFIX);
} else {
return(null);
};
Expand All @@ -32,9 +37,9 @@ include {
include {
if(MPI_USE_LAM) {
if(MPI_LAM_MULTIPLE) {
return("common/mpi/rpms/lam-multiple");
return("common/mpi/rpms/lam-multiple"+RPMS_SUFFIX);
} else {
return("common/mpi/rpms/lam");
return("common/mpi/rpms/lam"+RPMS_SUFFIX);
};
} else {
return(null);
Expand All @@ -43,19 +48,31 @@ include {

include {
if(MPI_USE_OPENMPI) {
return("common/mpi/rpms/openmpi");
return("common/mpi/rpms/openmpi"+RPMS_SUFFIX);
} else {
return(null);
};
};


# mpi-start script to ease use of MPI
'/software/packages' = pkg_repl('mpi-start',MPI_MPISTART_VERSION_FULL,'noarch');
'/software/packages' = if(OS_VERSION_PARAMS['major'] == 'sl5'){
pkg_repl('emi-mpi','1.0.2-1.el5','noarch');
pkg_repl('glite-yaim-mpi','1.1.12-1.el5','noarch');
'/software/packages' = if(is_defined(QUATTOR_SPMA_YUM) && QUATTOR_SPMA_YUM){
SELF['mpi-start']=nlist();
SELF;
}else{
pkg_repl('emi-mpi','1.0.2-1.el6','noarch');
pkg_repl('glite-yaim-mpi','1.1.12-1.el6','noarch');
pkg_repl('mpi-start',MPI_MPISTART_VERSION_FULL,'noarch');
};

'/software/packages' = if(is_defined(QUATTOR_SPMA_YUM) && QUATTOR_SPMA_YUM){
SELF['mpi-start']=nlist();
SELF;
}else{
if(OS_VERSION_PARAMS['major'] == 'sl5'){
pkg_repl('emi-mpi','1.0.2-1.el5','noarch');
pkg_repl('glite-yaim-mpi','1.1.12-1.el5','noarch');
}else{
pkg_repl('emi-mpi','1.0.2-1.el6','noarch');
pkg_repl('glite-yaim-mpi','1.1.12-1.el6','noarch');
};
};

5 changes: 5 additions & 0 deletions common/mpi/rpms/lam-multiple-yd.pan
View file
@@ -0,0 +1,5 @@
unique template common/mpi/rpms/lam-multiple-yd;

# MPI-1 implementation (replaces version in SL release)
'/software/packages/{lam-runtime}' = nlist();
'/software/packages/{lam-extras}' = nlist();
5 changes: 5 additions & 0 deletions common/mpi/rpms/lam-yd.pan
View file
@@ -0,0 +1,5 @@
unique template common/mpi/rpms/lam-yd;

# MPI-1 implementation (replaces version in SL release)
'/software/packages/{lam}' = nlist();

6 changes: 6 additions & 0 deletions common/mpi/rpms/mpich-yd.pan
View file
@@ -0,0 +1,6 @@
unique template common/mpi/rpms/mpich-yd;

# MPI-1 implementation
'/software/packages/{mpich}' ?= nlist();


6 changes: 6 additions & 0 deletions common/mpi/rpms/mpich2-yd.pan
View file
@@ -0,0 +1,6 @@
unique template common/mpi/rpms/mpich2-yd;

# MPI-2 implementation
'/software/packages/{mpich2}' ?= nlist();


6 changes: 6 additions & 0 deletions common/mpi/rpms/openmpi-yd.pan
View file
@@ -0,0 +1,6 @@
unique template common/mpi/rpms/openmpi-yd;

# MPI-2 implementation (descendent of LAM)
'/software/packages/{openmpi}' ?= nlist();


2 changes: 1 addition & 1 deletion common/torque2/client/client-only.pan
View file
Expand Up @@ -14,7 +14,7 @@ variable TORQUE_CLIENT_MOM_ENABLED ?= false;
variable PBS_MONITORING_TEMPLATE ?= null;

# Add RPMs
include { 'common/torque2/client/rpms/config' };
include { 'common/torque2/client/rpms/config' + RPMS_SUFFIX };


# include configuration common to client and server
Expand Down
10 changes: 10 additions & 0 deletions common/torque2/client/rpms/config-yd.pan
View file
@@ -0,0 +1,10 @@
unique template common/torque2/client/rpms/config-yd;

variable PKG_ARCH_TORQUE_MAUI ?= PKG_ARCH_GLITE;
variable TORQUE_CLIENT_MOM_ENABLED ?= true;

prefix '/software/packages';

'{emi-torque-client}' ?= nlist();
'{munge}' ?= nlist();
'{munge-libs}' ?= nlist();
2 changes: 1 addition & 1 deletion common/torque2/client/service.pan
View file
Expand Up @@ -7,7 +7,7 @@ variable TORQUE_VERSION ?= if(OS_VERSION_PARAMS['major'] == 'sl5'){
};

# Add RPMs
include { 'common/torque2/client/rpms/config' };
include { 'common/torque2/client/rpms/config' + RPMS_SUFFIX };

# Configure Torque client
include { 'common/torque2/client/config' };
Expand Down
15 changes: 15 additions & 0 deletions glite/bdii/rpms/config-yd.pan
View file
@@ -0,0 +1,15 @@
unique template glite/bdii/rpms/config-yd;

'/software/packages' = {
if (BDII_TYPE == 'site' || BDII_TYPE == 'combined') {
if (! is_defined(SELF[escape('emi-bdii-site')])) {
SELF[escape('emi-bdii-site')] = nlist();
};
};
if (BDII_TYPE == 'top') {
if (! is_defined(SELF[escape('emi-bdii-top')])) {
SELF[escape('emi-bdii-top')] = nlist();
};
};
SELF;
};
2 changes: 1 addition & 1 deletion glite/bdii/service.pan
View file
Expand Up @@ -20,7 +20,7 @@ variable BDII_TYPE = {


# Add BDII rpms
include { 'glite/bdii/rpms/config' };
include { 'glite/bdii/rpms/config' + RPMS_SUFFIX };


# Configure gLite base environment
Expand Down

0 comments on commit 2a822fb

Please sign in to comment.