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
quattor · Nov 7, 2024 · 8c0b1a4 · 8c0b1a4
1 parent f3a816e
commit 8c0b1a4
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 150 deletions.
diff --git a/clusters/grid/umd3/cluster.build.properties b/clusters/grid/umd3/cluster.build.properties
diff --git a/clusters/grid/umd3/profiles/cream.example.org.pan b/clusters/grid/umd3/profiles/cream.example.org.pan
diff --git a/clusters/grid/umd3/profiles/lfc.example.org.pan b/clusters/grid/umd3/profiles/lfc.example.org.pan
diff --git a/clusters/grid/umd3/profiles/wmslb.example.org.pan b/clusters/grid/umd3/profiles/wmslb.example.org.pan
diff --git a/clusters/grid/umd4/cluster.build.properties b/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=""
diff --git a/...d3/profiles/apel.example.org.tpl.disabled → ...d4/profiles/apel.example.org.tpl.disabled b/...d3/profiles/apel.example.org.tpl.disabled → ...d4/profiles/apel.example.org.tpl.disabled
diff --git a/.../grid/umd3/profiles/argus.example.org.pan → .../grid/umd4/profiles/argus.example.org.pan b/.../grid/umd3/profiles/argus.example.org.pan → .../grid/umd4/profiles/argus.example.org.pan
diff --git a/...s/grid/umd3/profiles/bdii.example.org.pan → ...s/grid/umd4/profiles/bdii.example.org.pan b/...s/grid/umd3/profiles/bdii.example.org.pan → ...s/grid/umd4/profiles/bdii.example.org.pan
diff --git a/...agios3-server.example.org.tpl.NOT_WORKING → ...agios3-server.example.org.tpl.NOT_WORKING b/...agios3-server.example.org.tpl.NOT_WORKING → ...agios3-server.example.org.tpl.NOT_WORKING
diff --git a/...umd3/profiles/px.example.org.tpl.disabled → ...umd4/profiles/px.example.org.tpl.disabled b/...umd3/profiles/px.example.org.tpl.disabled → ...umd4/profiles/px.example.org.tpl.disabled
diff --git a/...umd3/profiles/se-dpm-disk.example.org.pan → ...umd4/profiles/se-dpm-disk.example.org.pan b/...umd3/profiles/se-dpm-disk.example.org.pan → ...umd4/profiles/se-dpm-disk.example.org.pan
diff --git a/...md3/profiles/se-dpm-disk2.example.org.pan → ...md4/profiles/se-dpm-disk2.example.org.pan b/...md3/profiles/se-dpm-disk2.example.org.pan → ...md4/profiles/se-dpm-disk2.example.org.pan
diff --git a/...d3/profiles/se-dpm-server.example.org.pan → ...d4/profiles/se-dpm-server.example.org.pan b/...d3/profiles/se-dpm-server.example.org.pan → ...d4/profiles/se-dpm-server.example.org.pan
diff --git a/...rid/umd3/profiles/topbdii.example.org.pan → ...rid/umd4/profiles/topbdii.example.org.pan b/...rid/umd3/profiles/topbdii.example.org.pan → ...rid/umd4/profiles/topbdii.example.org.pan
diff --git a/...ers/grid/umd3/profiles/ui.example.org.pan → ...ers/grid/umd4/profiles/ui.example.org.pan b/...ers/grid/umd3/profiles/ui.example.org.pan → ...ers/grid/umd4/profiles/ui.example.org.pan
diff --git a/...ers/grid/umd3/profiles/wn.example.org.pan → ...ers/grid/umd4/profiles/wn.example.org.pan b/...ers/grid/umd3/profiles/wn.example.org.pan → ...ers/grid/umd4/profiles/wn.example.org.pan
diff --git a/...rs/grid/umd3/profiles/wn2.example.org.pan → ...rs/grid/umd4/profiles/wn2.example.org.pan b/...rs/grid/umd3/profiles/wn2.example.org.pan → ...rs/grid/umd4/profiles/wn2.example.org.pan
diff --git a/...rs/grid/umd3/profiles/wn3.example.org.pan → ...rs/grid/umd4/profiles/wn3.example.org.pan b/...rs/grid/umd3/profiles/wn3.example.org.pan → ...rs/grid/umd4/profiles/wn3.example.org.pan
diff --git a/clusters/grid/umd3/repository/config.pan → clusters/grid/umd4/repository/config.pan b/clusters/grid/umd3/repository/config.pan → clusters/grid/umd4/repository/config.pan
diff --git a/clusters/grid/umd3/site/cluster_info.pan → clusters/grid/umd4/site/cluster_info.pan b/clusters/grid/umd3/site/cluster_info.pan → clusters/grid/umd4/site/cluster_info.pan
diff --git a/...d/umd3/site/wn-cloning-cluster-config.pan → ...d/umd4/site/wn-cloning-cluster-config.pan b/...d/umd3/site/wn-cloning-cluster-config.pan → ...d/umd4/site/wn-cloning-cluster-config.pan
diff --git a/sites/example/site/config/example_nodes_properties.pan b/sites/example/site/config/example_nodes_properties.pan
diff --git a/sites/example/site/config/nodes_properties.pan b/sites/example/site/config/nodes_properties.pan
diff --git a/sites/example/site/os/errata-defaults.pan b/sites/example/site/os/errata-defaults.pan
diff --git a/sites/example/site/os/version_db.pan b/sites/example/site/os/version_db.pan
@@ -24,22 +24,22 @@ variable YUM_OS_DISTRIBUTION = {
 
 
 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("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"),		"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("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",
 );
 
 

diff --git a/sites/example/site/wn-cloning-config.pan b/sites/example/site/wn-cloning-config.pan
diff --git a/sites/example/vo/site/cms.pan b/sites/example/vo/site/cms.pan
@@ -2,10 +2,10 @@ 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',
+    nlist('description', 'production',
+          'fqan', '/cms/Role=t1production',
           'enabled', false,
+          'suffix', 'p',
+          'suffix2', 'p',
          ),
 );
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cluster.pan.includes=sites/example grid/umd-4 os quattor/23.9.0-rc1 standard
		cluster.pan.dep.ignore=""