From cd5395a5f70085b4e3efeea7251bb7aa1b5d433a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 15 May 2009 21:30:25 +0000 Subject: [PATCH 01/16] Tagging module nodeconfig - nodeconfig-4.3-3 changes to sysctl.conf for co* relating to tcp window scaling --- nodeconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nodeconfig.spec b/nodeconfig.spec index 9091dab..7edb92a 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -5,7 +5,7 @@ %define name nodeconfig %define version 4.3 -%define taglevel 2 +%define taglevel 3 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -103,6 +103,9 @@ chmod 700 /var/log/bm /var/www/html/yum %changelog +* Fri May 15 2009 Thierry Parmentelat - nodeconfig-4.3-3 +- changes to sysctl.conf for co* relating to tcp window scaling + * Tue Mar 24 2009 Thierry Parmentelat - nodeconfig-4.3-2 - renumbered 4.3 - new script upload-bmlog.php -- 2.43.0 From 47d8309a3d8c1fd8df70d86a417081fcfc465596 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Fri, 3 Jul 2009 20:33:51 +0000 Subject: [PATCH 02/16] allow for some specially tagged machines to get all plc config values. --- PlanetLabConf/get_plc_config.php | 74 ++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/PlanetLabConf/get_plc_config.php b/PlanetLabConf/get_plc_config.php index 6fd4d4c..645bfe8 100755 --- a/PlanetLabConf/get_plc_config.php +++ b/PlanetLabConf/get_plc_config.php @@ -11,6 +11,8 @@ // Try the new plc_config.php file first include 'plc_config.php'; +require_once 'plc_api.php'; +global $adm; if (isset($_REQUEST['perl'])) { $shebang = '#!/usr/bin/perl'; @@ -31,21 +33,69 @@ if (isset($_REQUEST['perl'])) { } echo $shebang . "\n"; +$limit_view = True; -foreach (array('PLC_API_HOST', 'PLC_API_PATH', 'PLC_API_PORT', - 'PLC_WWW_HOST', 'PLC_BOOT_HOST', 'PLC_PLANETFLOW_HOST', - 'PLC_NAME', 'PLC_SLICE_PREFIX', 'PLC_MONITOR_HOST', - 'PLC_MAIL_SUPPORT_ADDRESS', - 'PLC_MAIL_MOM_LIST_ADDRESS', - 'PLC_MAIL_SLICE_ADDRESS') - as $name) { - if (defined($name)) { - // Perl, PHP, Python, and sh all support strong single quoting - $value = "'" . str_replace("'", "\\'", constant($name)) . "'"; - printf($format, $name, $value); - } +if (isset($_REQUEST['node_id']) ) { + $node_id = intval($_REQUEST['node_id']); +} else { + $node_id = 0; +} + + +if ($node_id) { + $nodes = $adm->GetNodes($node_id); + if (!empty($nodes)) { + $node = $nodes[0]; + $tags = $adm->GetNodeTags(array('node_id' => $node_id, + 'tagname' => 'infrastructure')); + if (!empty($tags)) { + $tag = $tags[0]; + if ( intval($tag['value']) == 1 ) { + $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); + if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); + if (!empty($nodes)) { + $node = $nodes[0]; + if ( $node['node_id'] == $node_id ) + { + # NOTE: only provide complete view if + # node exists + # node has infrastrucure tag + # infrastructure tag value == 1 + # Check that the requestor is the node. + $limit_view = False; + } + } + } + } + } + } } +if ( $limit_view ) { + $plc_constants = array('PLC_API_HOST', 'PLC_API_PATH', 'PLC_API_PORT', + 'PLC_WWW_HOST', 'PLC_BOOT_HOST', 'PLC_PLANETFLOW_HOST', + 'PLC_NAME', 'PLC_SLICE_PREFIX', 'PLC_MONITOR_HOST', + 'PLC_MAIL_SUPPORT_ADDRESS', + 'PLC_MAIL_MOM_LIST_ADDRESS', + 'PLC_MAIL_SLICE_ADDRESS'); +} else { + $plc_constants = array(); + $const = get_defined_constants(true); + foreach ( $const['user'] as $name => $v ){ + if ( preg_match('/^PLC_/', $name) == 1 ){ + $plc_constants[] = $name; + } + } +} + +foreach ($plc_constants as $name) { + if (defined($name)) { + // Perl, PHP, Python, and sh all support strong single quoting + $value = "'" . str_replace("'", "\\'", constant($name)) . "'"; + printf($format, $name, $value); + } +} printf($format, 'PLC_API_CA_SSL_CRT', "'/usr/boot/cacert.pem'"); printf($format, 'PLC_ROOT_GPG_KEY_PUB', "'/usr/boot/pubring.gpg'"); -- 2.43.0 From fa6e2a99cb44b73bbcb712b998fdf8f9f6528415 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Sun, 5 Jul 2009 00:41:44 +0000 Subject: [PATCH 03/16] spaces not tabs. --- PlanetLabConf/get_plc_config.php | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/PlanetLabConf/get_plc_config.php b/PlanetLabConf/get_plc_config.php index 645bfe8..3d83056 100755 --- a/PlanetLabConf/get_plc_config.php +++ b/PlanetLabConf/get_plc_config.php @@ -36,37 +36,37 @@ echo $shebang . "\n"; $limit_view = True; if (isset($_REQUEST['node_id']) ) { - $node_id = intval($_REQUEST['node_id']); + $node_id = intval($_REQUEST['node_id']); } else { - $node_id = 0; + $node_id = 0; } if ($node_id) { - $nodes = $adm->GetNodes($node_id); + $nodes = $adm->GetNodes($node_id); if (!empty($nodes)) { $node = $nodes[0]; $tags = $adm->GetNodeTags(array('node_id' => $node_id, - 'tagname' => 'infrastructure')); + 'tagname' => 'infrastructure')); if (!empty($tags)) { $tag = $tags[0]; if ( intval($tag['value']) == 1 ) { - $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); - if (!empty($interfaces)) { - $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); - if (!empty($nodes)) { - $node = $nodes[0]; - if ( $node['node_id'] == $node_id ) - { - # NOTE: only provide complete view if - # node exists - # node has infrastrucure tag - # infrastructure tag value == 1 - # Check that the requestor is the node. - $limit_view = False; - } - } - } + $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); + if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); + if (!empty($nodes)) { + $node = $nodes[0]; + if ( $node['node_id'] == $node_id ) + { + # NOTE: only provide complete view if + # node exists + # node has infrastrucure tag + # infrastructure tag value == 1 + # Check that the requestor is the node. + $limit_view = False; + } + } + } } } } @@ -80,21 +80,21 @@ if ( $limit_view ) { 'PLC_MAIL_MOM_LIST_ADDRESS', 'PLC_MAIL_SLICE_ADDRESS'); } else { - $plc_constants = array(); - $const = get_defined_constants(true); - foreach ( $const['user'] as $name => $v ){ - if ( preg_match('/^PLC_/', $name) == 1 ){ - $plc_constants[] = $name; - } - } + $plc_constants = array(); + $const = get_defined_constants(true); + foreach ( $const['user'] as $name => $v ){ + if ( preg_match('/^PLC_/', $name) == 1 ){ + $plc_constants[] = $name; + } + } } foreach ($plc_constants as $name) { - if (defined($name)) { - // Perl, PHP, Python, and sh all support strong single quoting - $value = "'" . str_replace("'", "\\'", constant($name)) . "'"; - printf($format, $name, $value); - } + if (defined($name)) { + // Perl, PHP, Python, and sh all support strong single quoting + $value = "'" . str_replace("'", "\\'", constant($name)) . "'"; + printf($format, $name, $value); + } } printf($format, 'PLC_API_CA_SSL_CRT', "'/usr/boot/cacert.pem'"); printf($format, 'PLC_ROOT_GPG_KEY_PUB', "'/usr/boot/pubring.gpg'"); -- 2.43.0 From 0cf2b3b0c256a3d90b1092913210159bdbf4bb43 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Sun, 5 Jul 2009 00:43:14 +0000 Subject: [PATCH 04/16] Tagging module nodeconfig - nodeconfig-4.3-4 add two views to the PLC config data, limited and unlimited. unlimited view reports all values. Requires the 'infrastructure=1' tag and that the call originates from the node. --- nodeconfig.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nodeconfig.spec b/nodeconfig.spec index 7edb92a..18521dc 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -5,7 +5,7 @@ %define name nodeconfig %define version 4.3 -%define taglevel 3 +%define taglevel 4 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -103,6 +103,11 @@ chmod 700 /var/log/bm /var/www/html/yum %changelog +* Sat Jul 04 2009 Stephen Soltesz - nodeconfig-4.3-4 +- add two views to the PLC config data, limited and unlimited. +- unlimited view reports all values. Requires the 'infrastructure=1' tag and +- that the call originates from the node. + * Fri May 15 2009 Thierry Parmentelat - nodeconfig-4.3-3 - changes to sysctl.conf for co* relating to tcp window scaling -- 2.43.0 From eab5c80e5494cafaf990fbf9a81664153f2da036 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 15 Jul 2009 14:56:57 +0000 Subject: [PATCH 05/16] use node_id provided by the caller. --- PlanetLabConf/keys.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index df466b5..cb602c1 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -47,17 +47,10 @@ if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { } } -if (isset($_REQUEST['site_admin'])) { - // Look up the node - if ($__PLC_API_VERSION==4.2) - $interfaces = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); - else - $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); - if (!empty($interfaces)) { - $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); - if (!empty($nodes)) { - $node = $nodes[0]; - } +if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) { + $nodes = $adm->GetNodes(array(intval($_REQUEST['node_id']))); + if (!empty($nodes)) { + $node = $nodes[0]; } if (isset($node)) { // Look up the site -- 2.43.0 From ce3fe64fdd40048f63d70b95e119821379800c7b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 15 Jul 2009 15:04:23 +0000 Subject: [PATCH 06/16] add all defined keys for the user --- PlanetLabConf/keys.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index cb602c1..9d34c42 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -72,9 +72,14 @@ if (isset($_REQUEST['root'])) if (!empty($persons)) { $key_ids = array(); - foreach ($persons as $person) - if ($person['key_ids']) - $key_ids[] = $person['key_ids'][0]; + foreach ($persons as $person) { + if ($person['key_ids']) { + $person_key_ids = $person['key_ids']; + foreach ($person_key_ids as $person_key_id) { + $key_ids[] = $person_key_id; + } + } + } if (!empty($key_ids)) $keys = $adm->GetKeys($key_ids); } -- 2.43.0 From 9f350979dcb5a9b5e1643f81fa93326e23c231a4 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 16 Jul 2009 06:53:22 +0000 Subject: [PATCH 07/16] cleanup unused PLC_API_VERSION --- PlanetLabConf/keys.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index 9d34c42..cfffba0 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -1,8 +1,8 @@ GetPersons(array('roles' => array($_REQUEST['role']))); $all_persons = $adm->GetPersons(); foreach ($all_persons as $person) { @@ -55,7 +48,7 @@ if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) { if (isset($node)) { // Look up the site $sites = $adm->GetSites(array($node['site_id'])); - // Can't filter on roles so have to bruit force through entire userlist of site. + // Can't filter on roles so have to brute force through entire userlist of site. if ($sites && $sites[0]['person_ids']) { $all_persons = $adm->GetPersons($sites[0]['person_ids']); if (!empty($all_persons)) -- 2.43.0 From be60c94d76daf3d370514cf624f4533a9b839a56 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 16 Jul 2009 06:53:39 +0000 Subject: [PATCH 08/16] removed unused scripts --- PlanetLabConf/bwlimit.php | 45 --------------------------------------- PlanetLabConf/sudoers | 36 ------------------------------- 2 files changed, 81 deletions(-) delete mode 100755 PlanetLabConf/bwlimit.php delete mode 100755 PlanetLabConf/sudoers diff --git a/PlanetLabConf/bwlimit.php b/PlanetLabConf/bwlimit.php deleted file mode 100755 index a35bdeb..0000000 --- a/PlanetLabConf/bwlimit.php +++ /dev/null @@ -1,45 +0,0 @@ - -// Copyright (C) 2006 The Trustees of Princeton University -// -// $Id$ -// - -// Get admin API handle -require_once 'plc_api.php'; -global $adm; - -// Look up the node -// backwards compatibility with the old 4.2 API -global $__PLC_API_VERSION; -if ( ! method_exists ($adm,"GetInterfaces")) - $__PLC_API_VERSION = 4.2; -else - $__PLC_API_VERSION = 4.3; - -if ($__PLC_API_VERSION==4.2) - $interfaces = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -else - $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); - -if (!empty($interfaces)) { - if ($interfaces[0]['bwlimit'] !== NULL) { - $rate = $interfaces[0]['bwlimit']; - if ($rate >= 1000000000 && ($rate % 1000000000) == 0) { - printf("%.0fgbit", ($rate / 1000000000.)); - } elseif ($rate >= 1000000 && ($rate % 1000000) == 0) { - printf("%.0fmbit", ($rate / 1000000.)); - } elseif ($rate >= 1000) { - printf("%.0fkbit", ($rate / 1000.)); - } else { - printf("%.0fbit", $rate); - } - } else { - print "-1"; - } -} - -?> diff --git a/PlanetLabConf/sudoers b/PlanetLabConf/sudoers deleted file mode 100755 index e29525a..0000000 --- a/PlanetLabConf/sudoers +++ /dev/null @@ -1,36 +0,0 @@ -# ----------------------------------------------------------------- -# We're assuming that ssh authentication has already been used, this -# is more risky than I'm comfortable with, but it saves the problem -# of managing a separate password file. -# ----------------------------------------------------------------- -Defaults !authenticate - -# ----------------------------------------------------------------- -# No surpise... root has universal access -# ----------------------------------------------------------------- -root ALL = (ALL) ALL - -# ----------------------------------------------------------------- -# SITE_CMDS are those available to local site administrators -# ----------------------------------------------------------------- -Cmnd_Alias SITE_CMDS = /usr/sbin/vps, \ - /usr/sbin/vpstree, \ - /usr/sbin/vtop, \ - /bin/ps, \ - /usr/bin/pstree, \ - /usr/bin/top, \ - /usr/sbin/tcpdump, \ - /usr/bin/pfgrep, \ - /usr/local/planetlab/bin/pl-catlogs, \ - /sbin/halt, \ - /sbin/reboot, \ - /sbin/shutdown, \ - /usr/bin/passwd -d site_admin, \ - /usr/bin/passwd site_admin, \ - /bin/more /var/log/messages, \ - /bin/more /var/log/nm - -# ----------------------------------------------------------------- -# Site Admins -- accounts with admin privileges on the local nodes -# ----------------------------------------------------------------- -site_admin ALL = SITE_CMDS -- 2.43.0 From 9e13539872973169d8a9e1e17ea9355002eb93d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 17 Jul 2009 09:14:35 +0000 Subject: [PATCH 09/16] --- PlanetLabConf/keys.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index cfffba0..ed4cfd2 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -33,6 +33,8 @@ if (!empty($_REQUEST['role'])) { } } } + +// {ple,pl}_monitor user is created on the nodes by the monitor-runlevelagent init script. if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { $user = $adm->GetPersons(array('first_name' => 'Site', 'last_name' => 'Assistant')); if (!empty($user)) { -- 2.43.0 From 8d5efe94ed1ae371b0f372fb510b3a27c6cdc81d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 21 Jul 2009 10:47:18 +0000 Subject: [PATCH 10/16] ignore {ple,plc}_monitor user. --- PlanetLabConf/keys.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index ed4cfd2..5fca766 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -34,13 +34,16 @@ if (!empty($_REQUEST['role'])) { } } -// {ple,pl}_monitor user is created on the nodes by the monitor-runlevelagent init script. -if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { - $user = $adm->GetPersons(array('first_name' => 'Site', 'last_name' => 'Assistant')); - if (!empty($user)) { - $persons[] = $user[0]; - } -} +// +// NOTE: this user is not used by the monitor for the moment. +// +/* // {ple,pl}_monitor user is created on the nodes by the monitor-runlevelagent init script. */ +/* if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { */ +/* $user = $adm->GetPersons(array('first_name' => 'Site', 'last_name' => 'Assistant')); */ +/* if (!empty($user)) { */ +/* $persons[] = $user[0]; */ +/* } */ +/* } */ if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) { $nodes = $adm->GetNodes(array(intval($_REQUEST['node_id']))); -- 2.43.0 From 9057ccd2810a84f2ab51723550fbc9537c5282f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Thu, 23 Jul 2009 15:03:38 +0000 Subject: [PATCH 11/16] return node extensions. --- PlanetLabConf/extensions.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 PlanetLabConf/extensions.php diff --git a/PlanetLabConf/extensions.php b/PlanetLabConf/extensions.php new file mode 100755 index 0000000..53807bb --- /dev/null +++ b/PlanetLabConf/extensions.php @@ -0,0 +1,12 @@ +GetNodeExtensions($node_id); +} + +?> + -- 2.43.0 From f794a16590547a58ce730a26da5a50fbc297f426 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 7 Sep 2009 12:43:55 +0000 Subject: [PATCH 12/16] Setting tag nodeconfig-4.3-5 new script for updating the exentions set keys.php reviewed cleanup useless scripts --- nodeconfig.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nodeconfig.spec b/nodeconfig.spec index 18521dc..2be306d 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -5,7 +5,7 @@ %define name nodeconfig %define version 4.3 -%define taglevel 4 +%define taglevel 5 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -103,6 +103,11 @@ chmod 700 /var/log/bm /var/www/html/yum %changelog +* Mon Sep 07 2009 Thierry Parmentelat - nodeconfig-4.3-5 +- new script for updating the exentions set +- keys.php reviewed +- cleanup useless scripts + * Sat Jul 04 2009 Stephen Soltesz - nodeconfig-4.3-4 - add two views to the PLC config data, limited and unlimited. - unlimited view reports all values. Requires the 'infrastructure=1' tag and -- 2.43.0 From 2eb6622c2e10e0d6c30261a9fc298fe09202633e Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 20 Nov 2009 22:38:25 +0000 Subject: [PATCH 13/16] --- PlanetLabConf/ntp/ntp.conf.tp.pl | 3 +++ PlanetLabConf/ntp/ntp.conf.tpnet.pl | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 PlanetLabConf/ntp/ntp.conf.tp.pl create mode 100755 PlanetLabConf/ntp/ntp.conf.tpnet.pl diff --git a/PlanetLabConf/ntp/ntp.conf.tp.pl b/PlanetLabConf/ntp/ntp.conf.tp.pl new file mode 100755 index 0000000..ca9b0e6 --- /dev/null +++ b/PlanetLabConf/ntp/ntp.conf.tp.pl @@ -0,0 +1,3 @@ +server ntp1.tp.pl +server ntp2.tp.pl + diff --git a/PlanetLabConf/ntp/ntp.conf.tpnet.pl b/PlanetLabConf/ntp/ntp.conf.tpnet.pl new file mode 100755 index 0000000..ca9b0e6 --- /dev/null +++ b/PlanetLabConf/ntp/ntp.conf.tpnet.pl @@ -0,0 +1,3 @@ +server ntp1.tp.pl +server ntp2.tp.pl + -- 2.43.0 From 7b7965d0864f1cbef016d80d72c9d20901849b49 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Sun, 22 Nov 2009 18:29:49 +0000 Subject: [PATCH 14/16] nix extra new line --- PlanetLabConf/ntp/ntp.conf.tp.pl | 1 - PlanetLabConf/ntp/ntp.conf.tpnet.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/PlanetLabConf/ntp/ntp.conf.tp.pl b/PlanetLabConf/ntp/ntp.conf.tp.pl index ca9b0e6..d628c27 100755 --- a/PlanetLabConf/ntp/ntp.conf.tp.pl +++ b/PlanetLabConf/ntp/ntp.conf.tp.pl @@ -1,3 +1,2 @@ server ntp1.tp.pl server ntp2.tp.pl - diff --git a/PlanetLabConf/ntp/ntp.conf.tpnet.pl b/PlanetLabConf/ntp/ntp.conf.tpnet.pl index ca9b0e6..d628c27 100755 --- a/PlanetLabConf/ntp/ntp.conf.tpnet.pl +++ b/PlanetLabConf/ntp/ntp.conf.tpnet.pl @@ -1,3 +1,2 @@ server ntp1.tp.pl server ntp2.tp.pl - -- 2.43.0 From ac14223827a28227fb77c56ee46e7ade02580b54 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Sun, 22 Nov 2009 18:31:27 +0000 Subject: [PATCH 15/16] Setting tag nodeconfig-4.3-6 For all MyPLC nodes deployed at Polish Telecom (PLC, PLE and CoBlitz), use the TP local NTP servers. --- nodeconfig.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nodeconfig.spec b/nodeconfig.spec index 2be306d..bf0eb5b 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -5,7 +5,7 @@ %define name nodeconfig %define version 4.3 -%define taglevel 5 +%define taglevel 6 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -103,6 +103,10 @@ chmod 700 /var/log/bm /var/www/html/yum %changelog +* Sun Nov 22 2009 Marc Fiuczynski - nodeconfig-4.3-6 +- For all MyPLC nodes deployed at Polish Telecom (PLC, PLE and CoBlitz), +- use the TP local NTP servers. + * Mon Sep 07 2009 Thierry Parmentelat - nodeconfig-4.3-5 - new script for updating the exentions set - keys.php reviewed -- 2.43.0 From b150e95b460dd44195d55fdfecb6d957fa68f619 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 25 Nov 2009 13:35:29 +0000 Subject: [PATCH 16/16] use the deployment tag to get the repo directory. we use the same method as in bootstapfs' case, a sub-folder to with deployment's name. --- yum/myplc.repo.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/yum/myplc.repo.php b/yum/myplc.repo.php index e76be48..01b4a97 100644 --- a/yum/myplc.repo.php +++ b/yum/myplc.repo.php @@ -40,6 +40,7 @@ if ( ! isset($_REQUEST['slicefamily'])) { # the nodegroups the node is part of $nodegroup_names=array(); +$deployment = ""; if ( ! isset($_REQUEST['node_id'])) { print "# Warning : node_id not set\n"; } else { @@ -54,11 +55,23 @@ if ( ! isset($_REQUEST['node_id'])) { $nodegroup_names [] = $nodegroup_name; echo "# in nodegroup $nodegroup_name \n" ; } + $node_tag_ids = $nodes[0]['node_tag_ids']; + $node_tags = $adm->GetNodeTags($node_tag_ids); + foreach ($node_tags as $node_tag) { + if ($node_tag['tagname'] == 'deployment') { + $deployment = $node_tag['value']; + break; + } + } } $topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/"; $topurl="https://$PLC_BOOT_HOST" . "/install-rpms/"; +if ($deployment == 'alpha') { + $topdir = $topdir . "alpha/"; + $topurl = $topurl . "alpha/"; +} # locate the planetlab repo for this node family & nodegroup $repo=NULL; -- 2.43.0