retitle 769497 unblock: slapos.core/1.2.4.1-2 thanks Hi, Niels Thykier <niels@thykier.net> writes: > Ack, please upload those changes to unstable (with a reasonable > changelog entry) and let us know once it has been accepted. I have just uploaded it to unstable and I have attached the debdiff to this email. Thank you very much in advance. unblock slapos.core/1.2.4.1-2 Cheers, -- Arnaud Fontaine
diff -Nru slapos.core-1.2.4.1/debian/changelog slapos.core-1.2.4.1/debian/changelog
--- slapos.core-1.2.4.1/debian/changelog 2014-10-16 11:34:13.000000000 +0900
+++ slapos.core-1.2.4.1/debian/changelog 2014-11-20 15:49:53.000000000 +0900
@@ -1,3 +1,12 @@
+slapos.core (1.2.4.1-2) unstable; urgency=medium
+
+ * d/control: Depends on python-psutil >= 2.0.0 due to API change leading
+ to AttributeError when running 'slapos node collect' subcommand.
+ * d/slapos-node-unofficial.cron.d: Fix wrong crontab making the package
+ unuseable with master node.
+
+ -- Arnaud Fontaine <arnau@debian.org> Thu, 20 Nov 2014 15:49:53 +0900
+
slapos.core (1.2.4.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru slapos.core-1.2.4.1/debian/control slapos.core-1.2.4.1/debian/control
--- slapos.core-1.2.4.1/debian/control 2014-10-16 11:07:17.000000000 +0900
+++ slapos.core-1.2.4.1/debian/control 2014-11-20 15:46:30.000000000 +0900
@@ -52,7 +52,8 @@
# slapos.format
bridge-utils,
uml-utilities,
- python-netaddr (>= 0.7.5~)
+ python-netaddr (>= 0.7.5~),
+ python-psutil (>= 2.0.0),
Breaks: ${python:Breaks},
slapos-client (<< 1.0.2.1-1~)
# slapos.grid
diff -Nru slapos.core-1.2.4.1/debian/slapos-node-unofficial.cron.d slapos.core-1.2.4.1/debian/slapos-node-unofficial.cron.d
--- slapos.core-1.2.4.1/debian/slapos-node-unofficial.cron.d 2014-04-26 18:30:35.000000000 +0900
+++ slapos.core-1.2.4.1/debian/slapos-node-unofficial.cron.d 2014-11-20 15:48:36.000000000 +0900
@@ -2,7 +2,18 @@
PATH=/usr/bin:/usr/sbin:/sbin:/bin
MAILTO=root
-*/5 * * * * root /usr/bin/slapos node software --log-file=/var/log/slapos/slapos-node-software.log
-*/5 * * * * root /usr/bin/slapos node instance --log-file=/var/log/slapos/slapos-node-instance.log
-0 0 * * * root /usr/bin/slapos node report --log-file=/var/log/slapos/slapos-node-report.log
-0 0 * * * root /usr/bin/slapos node format
+# Run "Installation/Destruction of Software Releases" and "Deploy/Start/Stop Partitions" once per minute
+* * * * * root /usr/bin/slapos node software --verbose --logfile=/var/log/slapos/slapos-node-software.log --pidfile=/var/run/slapos-node-software.pid > /dev/null 2>&1
+* * * * * root /usr/bin/slapos node instance --promise-timeout 20 --verbose --log-file=/var/log/slapos/slapos-node-instance.log --pidfile=/var/run/slapos-node-instance.pid > /dev/null 2>&1
+
+# Run "Destroy Partitions to be destroyed" once per hour
+0 * * * * root /usr/bin/slapos node report --maximal_delay=3600 --verbose --logfile=/var/log/slapos/slapos-node-report.log > /dev/null 2>&1
+
+# Run "Check/add IPs and so on" once per hour
+0 * * * * root /usr/bin/slapos node format >> /var/log/slapos/slapos-node-format.log 2>&1
+
+# Run "Booting" on every system start
+@reboot root /usr/bin/slapos node boot >> /var/log/slapos/slapos-node-boot.log 2>&1
+
+# Run "Collect" once a minute
+* * * * * root /usr/bin/slapos node collect >> /var/log/slapos/slapos-node-collect.log 2>&1
Attachment:
signature.asc
Description: PGP signature