Barış Metin [Wed, 16 Dec 2009 14:09:03 +0000 (14:09 +0000)]
Setting tag PLEWWW-4.3-40
* show error messages for update interface
* 'Add Node' is admin only
* add site selector for 'Add Node'
Thierry Parmentelat [Wed, 16 Dec 2009 11:30:25 +0000 (11:30 +0000)]
turn ipfw back on
Thierry Parmentelat [Wed, 16 Dec 2009 04:39:01 +0000 (04:39 +0000)]
fixing builds
Thierry Parmentelat [Tue, 15 Dec 2009 20:53:09 +0000 (20:53 +0000)]
messing for f12
Thierry Parmentelat [Tue, 15 Dec 2009 18:22:11 +0000 (18:22 +0000)]
trying out the vsys branch
Thierry Parmentelat [Tue, 15 Dec 2009 14:45:55 +0000 (14:45 +0000)]
fix personality for cross-rpm fix, run rebuilddb again, and pass topleve verbose as appropriate
Thierry Parmentelat [Tue, 15 Dec 2009 14:13:30 +0000 (14:13 +0000)]
let an f12 box create a vserver with an older rpm release, like f8, f10 or centos5
Marta Carbone [Tue, 15 Dec 2009 13:39:34 +0000 (13:39 +0000)]
Update .mk files according the new ipfw source structure (from Rev. 16174)
Anil-Kumar Vengalil [Tue, 15 Dec 2009 12:50:23 +0000 (12:50 +0000)]
as discussed with tony, let sfa trunk get tested through the nightly
Thierry Parmentelat [Tue, 15 Dec 2009 10:18:16 +0000 (10:18 +0000)]
cosmo
Thierry Parmentelat [Tue, 15 Dec 2009 09:50:51 +0000 (09:50 +0000)]
util-vserver needs e2fsprogs-devel
Thierry Parmentelat [Tue, 15 Dec 2009 09:49:54 +0000 (09:49 +0000)]
try out nodemanager trunk
Thierry Parmentelat [Tue, 15 Dec 2009 09:38:06 +0000 (09:38 +0000)]
trying out trunk kernel
Thierry Parmentelat [Tue, 15 Dec 2009 08:50:41 +0000 (08:50 +0000)]
use revisions in tags
Thierry Parmentelat [Tue, 15 Dec 2009 08:31:13 +0000 (08:31 +0000)]
Thierry Parmentelat [Tue, 15 Dec 2009 08:30:57 +0000 (08:30 +0000)]
turn off gpgcheck in f10
Thierry Parmentelat [Tue, 15 Dec 2009 04:33:49 +0000 (04:33 +0000)]
Barış Metin [Mon, 14 Dec 2009 23:22:44 +0000 (23:22 +0000)]
monitor now uses easy_install at build time
Thierry Parmentelat [Mon, 14 Dec 2009 22:31:18 +0000 (22:31 +0000)]
Thierry Parmentelat [Mon, 14 Dec 2009 17:48:44 +0000 (17:48 +0000)]
build yum for f12
Thierry Parmentelat [Mon, 14 Dec 2009 13:48:43 +0000 (13:48 +0000)]
set defaults in the specfile
Thierry Parmentelat [Mon, 14 Dec 2009 11:50:22 +0000 (11:50 +0000)]
distclean to wipe BUILDROOT
Thierry Parmentelat [Mon, 14 Dec 2009 10:48:27 +0000 (10:48 +0000)]
tweak set of rpms for the f12 kernel
Thierry Parmentelat [Mon, 14 Dec 2009 06:08:22 +0000 (06:08 +0000)]
Thierry Parmentelat [Sun, 13 Dec 2009 22:31:23 +0000 (22:31 +0000)]
first draft of the f12 distro
Thierry Parmentelat [Sun, 13 Dec 2009 22:30:47 +0000 (22:30 +0000)]
when rebuilding via srpm, pass the expected srpm name to the "make srpm" command
Daniel Hokka Zakrisson [Sun, 13 Dec 2009 15:06:29 +0000 (15:06 +0000)]
Setting tag Mom-2.3-2
Don't restart disabled services.
Thierry Parmentelat [Fri, 11 Dec 2009 14:33:22 +0000 (14:33 +0000)]
Thierry Parmentelat [Fri, 11 Dec 2009 14:27:56 +0000 (14:27 +0000)]
first rough f12 from deprecated f11
Thierry Parmentelat [Tue, 8 Dec 2009 18:05:04 +0000 (18:05 +0000)]
temporarily uses kernel trunk @15995
Thierry Parmentelat [Tue, 8 Dec 2009 18:04:02 +0000 (18:04 +0000)]
support for @revision in -SVNPATH
Thierry Parmentelat [Tue, 8 Dec 2009 08:00:36 +0000 (08:00 +0000)]
drop f11 and mirror f12 instead
Thierry Parmentelat [Mon, 7 Dec 2009 10:56:38 +0000 (10:56 +0000)]
turn off firstboot from bootstrapfs if present
Barış Metin [Wed, 2 Dec 2009 22:52:33 +0000 (22:52 +0000)]
use trunk for onelab-k27
Thierry Parmentelat [Tue, 1 Dec 2009 08:02:26 +0000 (08:02 +0000)]
using trunk for ipfw until this gets fixed
Thierry Parmentelat [Sun, 29 Nov 2009 13:22:16 +0000 (13:22 +0000)]
Setting tag ipfw-0.9-7
added missing qsort.c - tag 0.9-6 was broken
Thierry Parmentelat [Thu, 26 Nov 2009 14:32:44 +0000 (14:32 +0000)]
Setting tag vsys-scripts-0.95-12
improve usability of the ipfw backend
Thierry Parmentelat [Thu, 26 Nov 2009 14:31:19 +0000 (14:31 +0000)]
Setting tag ipfw-0.9-6
root: removed goto into the main ipfw switch, enabled slice_id matching
slice: completely move netconfig checks into the backend
Thierry Parmentelat [Thu, 26 Nov 2009 11:22:58 +0000 (11:22 +0000)]
Setting tag PLEWWW-4.3-39
new add-interface page : now has a checkbox for non-primary interfaces to chose between virtual or physical
this affects the settings of ifname and alias that were formerly set unconditionally
review the interface-checking javascript code
changed the interface to plekitform, method is now optional and part of an options hash
Thierry Parmentelat [Thu, 26 Nov 2009 11:11:08 +0000 (11:11 +0000)]
Setting tag MyPLC-4.3-32
turn off drupal on a box that acts as BOOT server but not as WWW server
cleanup some obsolete code for old chroot-jail packaging in the process
new bootcd-kernel script for keeping bootcd variants up2date
Andy Bavier [Tue, 24 Nov 2009 22:01:59 +0000 (22:01 +0000)]
Fix /etc/sudoers, /etc/init.d/halt in vserver-reference
Sapan Bhatia [Tue, 24 Nov 2009 04:57:10 +0000 (04:57 +0000)]
temporary change
Barış Metin [Mon, 23 Nov 2009 18:05:44 +0000 (18:05 +0000)]
fix typo
Thierry Parmentelat [Mon, 23 Nov 2009 13:53:33 +0000 (13:53 +0000)]
turn into a general-purpose vserver creation script
Marc Fiuczynski [Sun, 22 Nov 2009 18:31:27 +0000 (18:31 +0000)]
Setting tag nodeconfig-4.3-6
For all MyPLC nodes deployed at Polish Telecom (PLC, PLE and CoBlitz),
use the TP local NTP servers.
Stephen Soltesz [Fri, 20 Nov 2009 23:18:33 +0000 (23:18 +0000)]
Setting tag Monitor-3.0-25
add option for site status to include both node & pcu status
improve ticket handling
template gadget.xml for a site-specific google-gadget summary
Thierry Parmentelat [Fri, 20 Nov 2009 10:00:23 +0000 (10:00 +0000)]
test plewww trunk before tagging
Daniel Hokka Zakrisson [Thu, 19 Nov 2009 03:53:39 +0000 (03:53 +0000)]
Setting tag BootManager-4.3-14
Use ext2 instead of ext3.
Add NAT model option for nodes which don't resolve properly.
Daniel Hokka Zakrisson [Thu, 19 Nov 2009 03:28:49 +0000 (03:28 +0000)]
Setting tag util-vserver-pl-0.3-20
Log the error as well.
Thierry Parmentelat [Wed, 18 Nov 2009 20:07:12 +0000 (20:07 +0000)]
test plcapi trunk
Thierry Parmentelat [Tue, 17 Nov 2009 22:43:59 +0000 (22:43 +0000)]
Setting tag PLEWWW-4.3-38
can't use php objects for showing node status, this is too slow
fix interface add page
Thierry Parmentelat [Mon, 16 Nov 2009 23:23:42 +0000 (23:23 +0000)]
Setting tag PLEWWW-4.3-37
consistency in the way nodes status is displayed in the node and slice areas
extra tags columns show up on the nodes page as well, tweaked in the process
roles management in person page fixed
Thierry Parmentelat [Mon, 16 Nov 2009 15:32:02 +0000 (15:32 +0000)]
tweaks in onelab-k27
Anil-Kumar Vengalil [Mon, 16 Nov 2009 15:17:49 +0000 (15:17 +0000)]
Setting tag sfa-0.9-6
This tag includes:
- Sfatables
- Preliminary version of hash based authentication
- Initial code for Component Manager
- Authority structure is moved to /var/lib/sfa/
- some bug-fixes
Anil-Kumar Vengalil [Mon, 16 Nov 2009 13:07:37 +0000 (13:07 +0000)]
wsdl needs python-ZSI while building
Anil-Kumar Vengalil [Mon, 16 Nov 2009 11:51:29 +0000 (11:51 +0000)]
testing sfa in the trunk
Thierry Parmentelat [Mon, 16 Nov 2009 09:36:09 +0000 (09:36 +0000)]
turn off ipfw in 2.6.27 for now, not ready yet
Thierry Parmentelat [Sun, 15 Nov 2009 22:30:33 +0000 (22:30 +0000)]
Setting tag PLEWWW-4.3-36
displaying node tags in the nodes page as well
table headers now can have a 'title' that shows up when hovering on the column header
Thierry Parmentelat [Sat, 14 Nov 2009 13:26:24 +0000 (13:26 +0000)]
Setting tag PLEWWW-4.3-35
bugfix for the custom sortAlphaNumeric{Bottom,Top} sortable types
Thierry Parmentelat [Fri, 13 Nov 2009 13:38:07 +0000 (13:38 +0000)]
Setting tag PLEWWW-4.3-34
extensible set of columns in the nodes area of the (my)slice page
nodegroups can be added/deleted/updated
tags management improved marginally
Thierry Parmentelat [Mon, 9 Nov 2009 08:18:18 +0000 (08:18 +0000)]
Setting tag ipfw-0.9-5
additional features on matching packets, including uid match
Daniel Hokka Zakrisson [Mon, 9 Nov 2009 02:45:36 +0000 (02:45 +0000)]
Use CoBlitz tag.
Daniel Hokka Zakrisson [Mon, 9 Nov 2009 02:39:48 +0000 (02:39 +0000)]
Setting tag MyPLC-4.3-31
Make the /etc/hosts manipulation optional.
Thierry Parmentelat [Sun, 8 Nov 2009 15:29:49 +0000 (15:29 +0000)]
nozomi out with 2.6.27 for now
Daniel Hokka Zakrisson [Fri, 6 Nov 2009 21:32:54 +0000 (21:32 +0000)]
Disable fprobe-ulog.
Thierry Parmentelat [Fri, 6 Nov 2009 16:25:29 +0000 (16:25 +0000)]
first draft of a 27 kernel for PLE
Daniel Hokka Zakrisson [Thu, 5 Nov 2009 23:57:33 +0000 (23:57 +0000)]
Setting tag fprobe-ulog-1.1.3-1
Proper initscript semantics.
Daniel Hokka Zakrisson [Thu, 5 Nov 2009 20:38:47 +0000 (20:38 +0000)]
Setting tag MyPLC-4.3-30
Fix SetRole.
Marc Fiuczynski [Tue, 3 Nov 2009 21:33:12 +0000 (21:33 +0000)]
sync to right MyPLC tag
Marc Fiuczynski [Tue, 3 Nov 2009 21:20:22 +0000 (21:20 +0000)]
make coblitz-tag point at the latest MyPLC tag
Marc Fiuczynski [Tue, 3 Nov 2009 21:19:17 +0000 (21:19 +0000)]
Setting tag MyPLC-4.3-29
- Added "SetRole()" so that db-config.d/ scriplets can insert roles
into the DB.
- Added the root ssh key handling support back into plc.d/ssh and the
default xml file. This should be identical to the way it was in
rc12.
- Added support in the db-config.d/01-init script to register the root
ssh public key with the default administrator. In this way the root
ssh key will make it into the root account on the nodes by means of
NodeManager's specialaccounts plugin.
Marc Fiuczynski [Tue, 3 Nov 2009 21:13:12 +0000 (21:13 +0000)]
Setting tag PLCRT-1.0-11
Make sure to do updates to sendmail files, rather than appeneding same
hostname values to the end of files.
Marc Fiuczynski [Tue, 3 Nov 2009 21:11:15 +0000 (21:11 +0000)]
Setting tag PLCAPI-4.3-30
Redacting password, session, and authstring values from the event log.
Marc Fiuczynski [Tue, 3 Nov 2009 21:02:18 +0000 (21:02 +0000)]
switch temporarily to MyPLC trunk
Thierry Parmentelat [Tue, 3 Nov 2009 13:38:33 +0000 (13:38 +0000)]
using linux-2.6/tags/linux-2.6-22-39-1
Thierry Parmentelat [Tue, 3 Nov 2009 13:37:40 +0000 (13:37 +0000)]
oops
Thierry Parmentelat [Tue, 3 Nov 2009 13:36:04 +0000 (13:36 +0000)]
catching up
Thierry Parmentelat [Tue, 3 Nov 2009 10:33:40 +0000 (10:33 +0000)]
move to centos5.4
Anil-Kumar Vengalil [Sat, 31 Oct 2009 22:17:45 +0000 (22:17 +0000)]
pointing sfa back to the latest tag
Thierry Parmentelat [Sat, 31 Oct 2009 13:57:02 +0000 (13:57 +0000)]
add centos5.4
Anil-Kumar Vengalil [Sat, 31 Oct 2009 08:04:56 +0000 (08:04 +0000)]
testing sfa
Sapan Bhatia [Fri, 30 Oct 2009 18:18:11 +0000 (18:18 +0000)]
Setting tag NodeManager-1.8-20
This tag is identical to 1.8-19. The main addition is PLC-controllable vsys scripts. The reason I am
retagging is to eliminate any confusion associated with the -19 tag which was (temporarily) modified a few
days ago.
Anil-Kumar Vengalil [Fri, 30 Oct 2009 17:52:56 +0000 (17:52 +0000)]
going back to the status of today morning - what nightly has been using
Anil-Kumar Vengalil [Fri, 30 Oct 2009 15:03:14 +0000 (15:03 +0000)]
test build for vsys
Anil-Kumar Vengalil [Fri, 30 Oct 2009 14:38:56 +0000 (14:38 +0000)]
for testing vsys
Anil-Kumar Vengalil [Fri, 30 Oct 2009 12:23:55 +0000 (12:23 +0000)]
for guthemberg to test vsys; will revert back to the previous configuration after a test build
Andy Bavier [Thu, 29 Oct 2009 18:15:35 +0000 (18:15 +0000)]
Temporarily revert NodeManager to one that is running on VINI
Sapan Bhatia [Thu, 29 Oct 2009 01:09:20 +0000 (01:09 +0000)]
Setting tag vsys-scripts-0.95-11
* Load the tun module if it is not already loaded
* Fixed a bug in fd_tuntap
Sapan Bhatia [Wed, 28 Oct 2009 02:58:00 +0000 (02:58 +0000)]
Setting tag vsys-scripts-0.95-10
Adds Thom Haddow's tun/tap changes. I omitted a change in my previous commit.
Sapan Bhatia [Wed, 28 Oct 2009 02:53:39 +0000 (02:53 +0000)]
Setting tag vsys-scripts-0.95-9
This update adds Thom Haddow's custom tun/tap-device scripts.
Sapan Bhatia [Wed, 28 Oct 2009 01:47:07 +0000 (01:47 +0000)]
Setting tag NodeManager-1.8-19
This patch makes vsys scripts PLC-configurable. Previously, vsys scripts needed to be
self-contained. With this change, they will be able to refer to the attributes associated with a
slice.
Daniel Hokka Zakrisson [Wed, 28 Oct 2009 01:44:34 +0000 (01:44 +0000)]
Setting tag util-vserver-pl-0.3-19
Set ulimits for NM too.
Barış Metin [Mon, 26 Oct 2009 13:39:27 +0000 (13:39 +0000)]
Thierry's changes to handle svn_magic_line.
Thierry Parmentelat [Thu, 22 Oct 2009 09:25:29 +0000 (09:25 +0000)]
Setting tag BootstrapFS-1.0-10
cosmetic change in message at build-time
Thierry Parmentelat [Thu, 22 Oct 2009 09:24:18 +0000 (09:24 +0000)]
adopting manual tag BootManager-4.3-13
Barış Metin [Thu, 22 Oct 2009 09:13:40 +0000 (09:13 +0000)]
fix for syntax error
Setting tag NodeManager-1.8-18
--This line, and those below, will be ignored--
Please write a changelog for this new tag in the section above
DIFF=========
Index: tools.py
===================================================================
--- tools.py (.../tags/NodeManager-1.8-17) (révision 15402)
+++ tools.py (.../trunk) (révision 15402)
@@ -18,18 +18,21 @@
return interface
def get_hwaddr_from_plnode():
- for line in open("/usr/boot/plnode.txt", 'r').readlines():
- if line.startswith("NET_DEVICE"):
- return line.split("=")[1].strip().strip('"')
+ try:
+ for line in open("/usr/boot/plnode.txt", 'r').readlines():
+ if line.startswith("NET_DEVICE"):
+ return line.split("=")[1].strip().strip('"')
+ except:
+ pass
return None
def get_if_from_hwaddr(hwaddr):
- import sioc
- devs = sioc.gifconf()
- for dev in devs:
- dev_hwaddr = sioc.gifhwaddr(dev)
- if dev_hwaddr == hwaddr: return dev
- return None
+ import sioc
+ devs = sioc.gifconf()
+ for dev in devs:
+ dev_hwaddr = sioc.gifhwaddr(dev)
+ if dev_hwaddr == hwaddr: return dev
+ return None
def as_daemon_thread(run):
"""Call function <run> with no arguments in its own thread."""
Index: bwmon.py
===================================================================
--- bwmon.py (.../tags/NodeManager-1.8-17) (révision 15402)
+++ bwmon.py (.../trunk) (révision 15402)
@@ -324,7 +324,7 @@
(self.name,
bwlimit.format_tc_rate(maxrate),
bwlimit.format_tc_rate(maxi2rate)), 1)
- bwlimit.set(xid = self.xid, dev = dev_default
+ bwlimit.set(xid = self.xid, dev = dev_default,
minrate = self.MinRate * 1000,
maxrate = self.MaxRate * 1000,
maxexemptrate = self.Maxi2Rate * 1000,
Barış Metin [Thu, 22 Oct 2009 07:59:29 +0000 (07:59 +0000)]
- add install_date
Setting tag Monitor-3.0-24
--This line, and those below, will be ignored--
Please write a changelog for this new tag in the section above
DIFF=========
Index: nodequery.py
===================================================================
--- nodequery.py (.../tags/Monitor-3.0-23) (révision 15400)
+++ nodequery.py (.../trunk) (révision 15400)
@@ -38,6 +38,8 @@
fbnode['bootcd_version'] = "unknown"
if not fbnode['boot_server']:
fbnode['boot_server'] = "unknown"
+ if not fbnode['install_date']:
+ fbnode['install_date'] = "unknown"
fbnode['pcu'] = color_pcu_state(fbnode)
if not fields:
@@ -60,7 +62,7 @@
#print "ERROR!!!!!!!!!!!!!!!!!!!!!"
pass
- print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(kernel_version)s" % fbnode
+ print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(install_date)s | %(kernel_version)s" % fbnode
else:
format = ""
for f in fields:
Index: web/MonitorWeb/monitorweb/controllers.py
===================================================================
--- web/MonitorWeb/monitorweb/controllers.py (.../tags/Monitor-3.0-23) (révision 15400)
+++ web/MonitorWeb/monitorweb/controllers.py (.../trunk) (révision 15400)
@@ -54,6 +54,7 @@
kernel_version = widgets.CheckBox(label="Kernel")
bootcd_version = widgets.CheckBox(label="BootCD")
boot_server = widgets.CheckBox(label="Boot Server")
+ install_date = widgets.CheckBox(label="Installation Date")
observed_status = widgets.CheckBox(label="Observed Status")
uptime = widgets.CheckBox(label="Uptime")
traceroute = widgets.CheckBox(label="Traceroute")
Index: web/MonitorWeb/monitorweb/templates/nodescanhistory.kid
===================================================================
--- web/MonitorWeb/monitorweb/templates/nodescanhistory.kid (.../tags/Monitor-3.0-23) (révision 15400)
+++ web/MonitorWeb/monitorweb/templates/nodescanhistory.kid (.../trunk) (révision 15400)
@@ -63,6 +63,7 @@
<th class="sortable plekit_table">kernel</th>
<th class="sortable plekit_table">BootCD</th>
<th class="sortable plekit_table">Boot Server</th>
+ <th class="sortable plekit_table">Installation Date</th>
<th class="sortable plekit_table">Last_contact</th>
</tr>
</thead>
@@ -78,6 +79,7 @@
<td nowrap="true" py:content="node.kernel"></td>
<td nowrap="true" py:content="node.node.bootcd_version"></td>
<td nowrap="true" py:content="node.node.boot_server"></td>
+ <td nowrap="true" py:content="node.node.install_date"></td>
<td id="node-${node.node.observed_status}" py:content="diff_time(node.node.plc_node_stats['last_contact'])"></td>
</span>
</tr>
Index: web/MonitorWeb/monitorweb/templates/node_template.kid
===================================================================
--- web/MonitorWeb/monitorweb/templates/node_template.kid (.../tags/Monitor-3.0-23) (révision 15400)
+++ web/MonitorWeb/monitorweb/templates/node_template.kid (.../trunk) (révision 15400)
@@ -16,6 +16,7 @@
<th>kernel</th>
<th>BootCD</th>
<th>Boot Server</th>
+ <th>Installation Date</th>
<th>last_contact</th>
</span>
<span py:if="node is not None">
@@ -43,6 +44,7 @@
<td nowrap="true" py:content="node.kernel"></td>
<td nowrap="true" py:content="node.node.bootcd_version"></td>
<td nowrap="true" py:content="node.node.boot_server"></td>
+ <td nowrap="true" py:content="node.node.install_date"></td>
<td id="node-${node.node.observed_status}" py:content="diff_time(node.node.plc_node_stats['last_contact'])"></td>
</span>
</span>
Index: upgrade/monitor-server-3.0-23.sql
===================================================================
--- upgrade/monitor-server-3.0-23.sql (.../tags/Monitor-3.0-23) (révision 0)
+++ upgrade/monitor-server-3.0-23.sql (.../trunk) (révision 15400)
@@ -0,0 +1,3 @@
+
+ALTER TABLE findbadnoderecord ADD COLUMN install_date varchar DEFAULT NULL;
+ALTER TABLE findbadnoderecord_history ADD COLUMN install_date varchar DEFAULT NULL;
Index: monitor/database/info/findbad.py
===================================================================
--- monitor/database/info/findbad.py (.../tags/Monitor-3.0-23) (révision 15400)
+++ monitor/database/info/findbad.py (.../trunk) (révision 15400)
@@ -39,6 +39,7 @@
kernel_version = Field(String,default=None)
bootcd_version = Field(String,default=None)
boot_server = Field(String,default=None)
+ install_date = Field(String,default=None)
nm_status = Field(String,default=None)
fs_status = Field(String,default=None)
iptables_status = Field(String,default=None)
Index: monitor/scanapi.py
===================================================================
--- monitor/scanapi.py (.../tags/Monitor-3.0-23) (révision 15400)
+++ monitor/scanapi.py (.../trunk) (révision 15400)
@@ -238,6 +238,7 @@
echo ' "bmlog":"'`ls /tmp/bm.log`'",'
echo ' "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",'
echo ' "boot_server":"'`cat /mnt/cdrom/bootme/BOOTSERVER`'",'
+ echo ' "install_date":"'`python -c "import os,time,stat; print time.ctime(os.stat('/usr/boot/plnode.txt')[stat.ST_CTIME])"`'",'
echo ' "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",'
echo ' "dns_status":"'`host boot.planet-lab.org 2>&1`'",'
echo ' "iptables_status":"'`iptables -t mangle -nL | awk '$1~/^[A-Z]+$/ {modules[$1]=1;}END{for (k in modules) {if (k) printf "%s ",k;}}'`'",'
@@ -262,6 +263,7 @@
else:
values.update({'kernel_version': "", 'bmlog' : "", 'bootcd_version' : '',
'boot_server' : '',
+ 'install_date' : '',
'nm_status' : '',
'fs_status' : '',
'uptime' : '',
Anil-Kumar Vengalil [Thu, 22 Oct 2009 07:42:25 +0000 (07:42 +0000)]
testing the trunk of NM
Anil-Kumar Vengalil [Wed, 21 Oct 2009 10:40:20 +0000 (10:40 +0000)]
Setting tag NodeManager-1.8-17
-fixed problem with sioc import at the build side
-bwlimit.set() now accepts the device and does not asume that it is eth0
Barış Metin [Tue, 20 Oct 2009 12:58:19 +0000 (12:58 +0000)]
- don't hardcode the device name (depends on util-vserver-pl change rev. 15385)
Setting tag NodeManager-1.8-16
--This line, and those below, will be ignored--
Please write a changelog for this new tag in the section above
DIFF=========
Index: tools.py
===================================================================
--- tools.py (.../tags/NodeManager-1.8-15) (révision 15386)
+++ tools.py (.../trunk) (révision 15386)
@@ -8,12 +8,31 @@
import threading
import fcntl
import commands
+import sioc
import logger
PID_FILE = '/var/run/nm.pid'
+def get_default_if():
+ interface = get_if_from_hwaddr(get_hwaddr_from_plnode())
+ if not interface: interface = "eth0"
+ return interface
+
+def get_hwaddr_from_plnode():
+ for line in open("/usr/boot/plnode.txt", 'r').readlines():
+ if line.startswith("NET_DEVICE"):
+ return line.split("=")[1].strip().strip('"')
+ return None
+
+def get_if_from_hwaddr(hwaddr):
+ devs = sioc.gifconf()
+ for dev in devs:
+ dev_hwaddr = sioc.gifhwaddr(dev)
+ if dev_hwaddr == hwaddr: return dev
+ return None
+
def as_daemon_thread(run):
"""Call function <run> with no arguments in its own thread."""
thr = threading.Thread(target=run)
Index: bwmon.py
===================================================================
--- bwmon.py (.../tags/NodeManager-1.8-15) (révision 15386)
+++ bwmon.py (.../trunk) (révision 15386)
@@ -52,8 +52,9 @@
seconds_per_day = 24 * 60 * 60
bits_per_byte = 8
+dev_default = tools.get_default_if()
# Burst to line rate (or node cap). Set by NM. in KBit/s
-default_MaxRate = int(bwlimit.get_bwcap() / 1000)
+default_MaxRate = int(bwlimit.get_bwcap(dev_default) / 1000)
default_Maxi2Rate = int(bwlimit.bwmax / 1000)
# 5.4 Gbyte per day. 5.4 * 1024 k * 1024M * 1024G
# 5.4 Gbyte per day max allowed transfered per recording period
@@ -323,7 +324,7 @@
(self.name,
bwlimit.format_tc_rate(maxrate),
bwlimit.format_tc_rate(maxi2rate)), 1)
- bwlimit.set(xid = self.xid,
+ bwlimit.set(xid = self.xid, dev = dev_default
minrate = self.MinRate * 1000,
maxrate = self.MaxRate * 1000,
maxexemptrate = self.Maxi2Rate * 1000,
@@ -704,7 +705,7 @@
nmdbcopy = copy.deepcopy(database.db)
database.db_lock.release()
try:
- if getDefaults(nmdbcopy) and len(bwlimit.tc("class show dev eth0")) > 0:
+ if getDefaults(nmdbcopy) and len(bwlimit.tc("class show dev %s" % dev_default)) > 0:
# class show to check if net:InitNodeLimit:bwlimit.init has run.
sync(nmdbcopy)
else: logger.log("bwmon: BW limits DISABLED.")
Index: net.py
===================================================================
--- net.py (.../tags/NodeManager-1.8-15) (révision 15386)
+++ net.py (.../trunk) (révision 15386)
@@ -11,8 +11,10 @@
import sioc, plnet
# local modules
-import bwlimit, logger, iptables
+import bwlimit, logger, iptables, tools
+dev_default = tools.get_default_if()
+
def start(options, conf):
logger.log("net plugin starting up...")
@@ -22,7 +24,7 @@
if 'OVERRIDES' in dir(config):
if config.OVERRIDES.get('net_max_rate') == '-1':
logger.log("net: Slice and node BW Limits disabled.")
- if len(bwlimit.tc("class show dev eth0")):
+ if len(bwlimit.tc("class show dev %s" % dev_default)):
logger.verbose("*** DISABLING NODE BW LIMITS ***")
bwlimit.stop()
else:
Index: plugins/rawdisk.py
===================================================================
--- plugins/rawdisk.py (.../tags/NodeManager-1.8-15) (révision 15386)
+++ plugins/rawdisk.py (.../trunk) (révision 15386)
@@ -39,7 +39,6 @@
break
buf = buf.strip()
fields = re.split(pat, buf)
- print fields
dev = fields[-1]
if not dev.startswith("dm-") and dev.endswith("1") and dev not in in_vg:
devices.append("/dev/%s" % dev)