[Python-apps-commits] r11327 - in packages/slapos.core/trunk/debian (5 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Tue Sep 30 06:52:59 UTC 2014


    Date: Tuesday, September 30, 2014 @ 06:52:58
  Author: arnau
Revision: 11327

New slapos.core upstream release (1.2.4).

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
  packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
  packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
  packages/slapos.core/trunk/debian/rules

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2014-09-28 17:28:51 UTC (rev 11326)
+++ packages/slapos.core/trunk/debian/changelog	2014-09-30 06:52:58 UTC (rev 11327)
@@ -1,3 +1,11 @@
+slapos.core (1.2.4-1) unstable; urgency=medium
+
+  * New upstream release. This fixes an issue with cliff >= 1.7.0.
+    + d/conf/slapos-node-unofficial.cfg: Add multimaster example configuration.
+    + d/rules: Install collect/README.txt as README.collect.txt.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Tue, 30 Sep 2014 15:05:17 +0900
+
 slapos.core (1.2.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
===================================================================
--- packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2014-09-28 17:28:51 UTC (rev 11326)
+++ packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2014-09-30 06:52:58 UTC (rev 11327)
@@ -28,6 +28,10 @@
 database_uri = /var/lib/slapos/proxy.db
 log_file = /var/log/slapos/slapos-node-proxy.log
 
+###############################
+# Optional, advanced parameters
+###############################
+
 # Below is the list of software maintained by slapos.org and contributors
 # It is used to simulate a proper configuration of a real slapos master.
 software_product_list =
@@ -42,6 +46,24 @@
   wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.163:/software/wordpress/software.cfg
   zabbixagent http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.162:/software/zabbix-agent/software.cfg
 
+# Here goes the list of slapos masters that slapos.proxy is authorized to contact to forward an instance request.
+# Each section beginning by "multimaster/" is a different SlapOS Master, represented by its URL.
+# For each section, you need to specify the URL of the SlapOS Master in the section name itself.
+# For each section, you can specify if needed the location of key/certificate used to authenticate to this slapOS Master.
+# For each section, you can specify if needed a list of Software Releases, separated by carrier return. Any instance request matching one of those Software Releases will be automatically forwarded to this SlapOS Master and will not be allocated locally.
+# When doing an instance request, you can specify in filter (a.k.a SLA) a "master_url" that will be used by the slapproxy to forward the request.
+#[multimaster/https://slap.vifib.com]
+#key = key file path coming from your slapos master account
+#cert = certificate file path coming from your slapos master account
+#software_release_list =
+#  http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+#
+#[multimaster/http://imaginary-slapos-master.com]
+# No certificate here: it is http.
+#software_release_list =
+#  http://mywebsite.me/my_software_release.cfg
+#  /some/arbitrary/local/unix/path
+
 [networkcache]
 # Define options for binary cache, used to download already compiled software.
 download-binary-cache-url = http://www.shacache.org/shacache

Modified: packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	2014-09-28 17:28:51 UTC (rev 11326)
+++ packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	2014-09-30 06:52:58 UTC (rev 11327)
@@ -4,7 +4,7 @@
 
 --- a/slapos/grid/slapgrid.py
 +++ b/slapos/grid/slapgrid.py
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
  PROMISE_TIMEOUT = 3
  
  # XXX hardcoded watchdog_path

Modified: packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch	2014-09-28 17:28:51 UTC (rev 11326)
+++ packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch	2014-09-30 06:52:58 UTC (rev 11327)
@@ -6,7 +6,7 @@
 
 --- a/slapos/cli/entry.py
 +++ b/slapos/cli/entry.py
-@@ -71,7 +71,15 @@
+@@ -69,7 +69,15 @@
              name = '%s %s' % (name, next_val) if name else next_val
              if name in self.commands:
                  cmd_ep = self.commands[name]
@@ -23,7 +23,7 @@
                  return (cmd_factory, name, search_args)
          else:
              LOG.critical('slapos: the command %r does not exist or is not yet implemented.\n'
-@@ -97,8 +105,15 @@
+@@ -95,8 +103,15 @@
          command_manager = app.command_manager
          groups = collections.defaultdict(list)
          for name, ep in sorted(command_manager):
@@ -41,7 +41,7 @@
  
          for group in sorted(groups):
              app.stdout.write('\n%s commands:\n' % group)
-@@ -106,20 +121,6 @@
+@@ -104,20 +119,6 @@
                  app.stdout.write(line)
          sys.exit(0)
  
@@ -59,6 +59,6 @@
 -        return group, '  %-13s  %s\n' % (name, one_liner)
 -
 -
- class SlapOSApp(cliff.app.App):
+ class SlapOSApp(App):
  
      #

Modified: packages/slapos.core/trunk/debian/rules
===================================================================
--- packages/slapos.core/trunk/debian/rules	2014-09-28 17:28:51 UTC (rev 11326)
+++ packages/slapos.core/trunk/debian/rules	2014-09-30 06:52:58 UTC (rev 11327)
@@ -4,11 +4,19 @@
 	dh $@ --with python2
 
 override_dh_install:
-	dh_install --list-missing
+	dh_install -XREADME -X.example --list-missing
 
+override_dh_installdocs:
+	dh_installdocs
+	cp slapos/collect/README.txt \
+		debian/slapos-node-unofficial/usr/share/doc/slapos-node-unofficial/README.collect.txt
+
 override_dh_compress:
 	dh_compress -X.cfg
 
+override_dh_python2:
+	dh_python2 -v
+
 # Generate the upstream tarball from upstream Git (adapted from
 # http://wiki.debian.org/SandroTosi/Svn_get-orig-source for Git)
 PACKAGE := $(shell dpkg-parsechangelog  | \




More information about the Python-apps-commits mailing list