Skip to content

Commit aa41ebd

Browse files
authored
Merge pull request #42 from jouvin/fix_grid_examples
Update the OS version definition for each server
2 parents 9120a21 + 9b66e44 commit aa41ebd

File tree

4 files changed

+22
-89
lines changed

4 files changed

+22
-89
lines changed

clusters/grid/umd4/profiles/nagios3-server.example.org.tpl.NOT_WORKING

Lines changed: 0 additions & 69 deletions
This file was deleted.

clusters/grid/umd4/profiles/px.example.org.tpl.disabled renamed to clusters/grid/umd4/profiles/px.example.org.pan.disabled

File renamed without changes.

clusters/grid/umd4/site/cluster_info.pan

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@ variable ENABLE_MPI ?= false;
2626
# phase and to reset it to false afterwards.
2727
# You can also override the default value defined here in a specific profile.
2828
variable AII_V2_INSTALL ?= false;
29-
3029
#
3130
# OS version definition
3231
#
3332
variable NODE_OS_VERSION_DB = "site/os/version_db";
34-
variable NODE_OS_VERSION_DEFAULT = "sl640-x86_64";
35-
3633

3734
# Default repository configuration template for the cluster
3835
variable PKG_REPOSITORY_CONFIG ?= 'repository/config';

sites/example/site/os/version_db.pan

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ unique template site/os/version_db;
1414

1515
variable YUM_OS_DISTRIBUTION = {
1616
# Default per OS version
17-
SELF['el7'] = 'centos71';
17+
SELF['el9'] = 'al9';
18+
SELF['el8'] = 'al8';
19+
SELF['el7'] = 'centos7';
1820

1921
# Explicit value per host name
2022
SELF['ui.example.org'] = 'centos7';
@@ -24,22 +26,25 @@ variable YUM_OS_DISTRIBUTION = {
2426

2527

2628
variable OS_VERSION = dict(
27-
escape("cream.example.org"), "el7x-x86_64",
28-
escape("dcache-head.example.org"), "el7x-i386",
29-
escape("dcache-pool.example.org"), "el7x-i386",
30-
escape("hydra.example.org"), "el7x-x86_64",
31-
escape("lfc.example.org"), "el7x-x86_64",
32-
escape("mon.example.org"), "el7x-x86_64",
33-
escape("ui.example.org"), "el7x-x86_64",
34-
escape("wmslb.example.org"), "el7x-x86_64",
35-
escape("wn2.example.org"), "el7x-x86_64",
36-
escape("xen-guest.example.org"), "el7x-x86_64",
37-
escape("xen-host.example.org"), "el7x-x86_64",
38-
39-
escape("nagios-server.example.org"), "el7x-x86_64",
40-
escape("nagios-master.example.org"), "el7x-x86_64",
41-
escape("nagios-slave-A.example.org"), "el7x-x86_64",
42-
escape("nagios-slave-B.example.org"), "el7x-x86_64",
29+
# Grid cluster
30+
'{apel.example.org}', 'el7x-x86_64',
31+
'{argus.example.org}', 'el7x-x86_64',
32+
'{bdii.example.org}', 'el7x-x86_64',
33+
'{px.example.org}', 'el7x-x86_64',
34+
'{se-dpm-disk2.example.org}', 'el7x-x86_64',
35+
'{se-dpm-disk.example.org}', 'el7x-x86_64',
36+
'{se-dpm-server.example.org}', 'el7x-x86_64',
37+
'{topbdii.example.org}', 'el7x-x86_64',
38+
'{ui.example.org}', 'el7x-x86_64',
39+
'{wn2.example.org}', 'el7x-x86_64',
40+
'{wn3.example.org}', 'el7x-x86_64',
41+
'{wn.example.org}', 'el7x-x86_64',
42+
43+
# Misc cluster
44+
'{nagios-server.example.org}', 'el7x-x86_64',
45+
'{nagios-master.example.org}', 'el7x-x86_64',
46+
'{nagios-slave-A.example.org}', 'el7x-x86_64',
47+
'{nagios-slave-B.example.org}', 'el7x-x86_64',
4348
);
4449

4550

0 commit comments

Comments
 (0)