From 527219e9cc9de99fc74e46f4dc23fbd1a0b5da58 Mon Sep 17 00:00:00 2001 From: schmelzs Date: Tue, 12 Jan 2010 14:49:44 +0100 Subject: added pbs stuff --- config-db/OpenSLX/AttributeRoster.pm | 14 +++++++++++++- config-db/slxconfig-demuxer | 27 ++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) (limited to 'config-db') diff --git a/config-db/OpenSLX/AttributeRoster.pm b/config-db/OpenSLX/AttributeRoster.pm index f039d20e..88d6295f 100644 --- a/config-db/OpenSLX/AttributeRoster.pm +++ b/config-db/OpenSLX/AttributeRoster.pm @@ -71,8 +71,10 @@ sub _init generates a set of images (see preboot_media) that can be used to remotely boot the systems referred to by this client + pbs + preboot server (experimental) End-of-Here - content_regex => qr{^(pxe|preboot)$}, + content_regex => qr{^(pxe|preboot|pbs)$}, content_descr => '"pxe" or "preboot"', default => 'pxe', }, @@ -141,6 +143,16 @@ sub _init content_descr => undef, default => '', }, + 'preboot_server' => { + applies_to_systems => 0, + applies_to_clients => 1, + description => unshiftHereDoc(<<' End-of-Here'), + !!experimental!! specifies location of openslx-preboot-server + End-of-Here + content_regex => undef, + content_descr => undef, + default => '', + }, 'ramfs_fsmods' => { applies_to_systems => 1, applies_to_clients => 0, diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer index 6e848486..b88efeb6 100755 --- a/config-db/slxconfig-demuxer +++ b/config-db/slxconfig-demuxer @@ -329,6 +329,7 @@ sub bootEnvironmentForType my %bootTypeMap = ( 'pxe' => 'PXE', 'preboot' => 'Preboot', + 'pbs' => 'PBS', ); my $bootType = $bootTypeMap{lc($bootTypeIn)} or die _tr( @@ -407,7 +408,7 @@ sub writeClientConfigurationsForSystem foreach my $client (@$clients) { next if $client->{name} eq '<<>>'; # skip default client, as it doesn't need any config-tgz - + next if ($client->{attrs}->{boot_type} || 'pxe') ne $bootType; # skip clients with non-matching boot type @@ -498,14 +499,22 @@ sub writeClientConfigurationsForSystem "$bootEnv->{'target-path'}/client-config/$externalSystemID" ); } - case 'preboot' { - # for preboot types - my $cname = $client->{name}; - createTarOfPath( - $buildPath, "${cname}.tgz", - "$bootEnv->{'target-path'}/client-config/$externalSystemID" - ); - } + case 'preboot' { + # for preboot types + my $cname = $client->{name}; + createTarOfPath( + $buildPath, "${cname}.tgz", + "$bootEnv->{'target-path'}/client-config/$externalSystemID" + ); + } + case 'pbs' { + # for preboot types + my $cname = $client->{name}; + createTarOfPath( + $buildPath, "${cname}.tgz", + "$bootEnv->{'target-path'}/client-config/$externalSystemID" + ); + } } } } -- cgit v1.2.3-55-g7522