Merge branch 'master' into 1.0

software/kvm/common.cfg

@@ -103,7 +103,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = cc72d7b89d8b474d7b4f2c9319b385d5
+md5sum = 1f7dc7b7f2740cf416927b144e93ccb1
 download-only = true
 on-update = true
 

software/kvm/instance-for-erp5testnode.cfg.in

@@ -26,6 +26,9 @@ pull-backup = ${template-pull-backup:output}
 [storage-configuration]
 storage-home = 
 
+[network-information]
+global-ipv4-network = 
+
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
@@ -43,6 +46,7 @@ extensions = jinja2.ext.do
 context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
+    key global_ipv4_prefix network-information:global-ipv4-network
     key slapparameter_dict slap-configuration:configuration
     key storage_dict slap-configuration:storage-dict
     key tap_network_dict slap-configuration:tap-network-information-dict
@@ -51,10 +55,13 @@ context =
     raw dcron_executable_location ${dcron:location}/sbin/crond
     raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
     raw novnc_location ${noVNC:location}
+    raw netcat_bin ${netcat:location}/bin/netcat
     raw openssl_executable_location ${openssl:location}/bin/openssl
     raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
+    raw template_httpd_cfg ${template-httpd:rendered}
+    raw template_content ${template-content:location}/${template-content:filename}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -94,7 +94,7 @@ return =
 {%   set error = '' -%}
 {%   if frontend_parameter_dict.get('kvm-partition-name', '') != '' -%}
 {%     set kvm_name = frontend_parameter_dict['kvm-partition-name'] -%}
-{%     set service_port = frontend_parameter_dict['service-port'] -%}
+{%     set service_port = str(frontend_parameter_dict['service-port']) -%}
 {%     if kvm_name in kvm_instance_dict.keys()  and not kvm_instance_dict[kvm_name][0] -%}
 {%       set error = "You should set parameter use-nat to 'true' for '" ~ kvm_name ~ "', or provide url to use for frontend." -%}
 {%     elif kvm_name in kvm_instance_dict.keys() and service_port in kvm_instance_dict[kvm_name][1] -%}

software/kvm/instance-kvm-input-schema.json

@@ -37,13 +37,13 @@
       "maximum": 8
     },
     "cpu-options": {
-      "title": "Additional options (cores, threads, sockets, maxcpus) to use with cpu-count.",
-      "description": "Additional options to use with cpu-count. Options are separated by coma: [cores=cores][,threads=threads][,sockets=sockets][,maxcpus=maxcpus]. Only set this option if you really know what you're doing.",
+      "title": "CPU Additional options: cores, threads, sockets, maxcpus.",
+      "description": "Additional options to use with cpu-count. Options are separated by coma: [cores=cores][,threads=threads][,sockets=sockets][,maxcpus=maxcpus]. Set this option if you know what you're doing.",
       "type": "string"
     },
     "numa": {
-      "title": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally.",
-      "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Only set this option if you really know what you're doing.",
+      "title": "Simulate a multi node NUMA system.",
+      "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
       "type": "string"
     },
 
@@ -103,10 +103,10 @@
       "default": 0
     },
     "external-disk-size": {
-      "title": "Number of additional disk to create for virtual machine, in Gigabytes",
-      "description": "Specify the number of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",
+      "title": "Size of additional disk to create for virtual machine, in Gigabytes",
+      "description": "Specify the size of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",
       "type": "integer",
-      "minimum": 5,
+      "minimum": 10,
       "maximum": 1000,
       "default": 20
     },

software/kvm/software-for-erp5testnode.cfg

@@ -5,6 +5,6 @@ extends = development.cfg
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-for-erp5testnode.cfg.in
-md5sum = 5883432c9a004cf505db2718c596ce6a
+md5sum = e0af93ba7209cabd5db6d9afcb15c2aa
 output = ${buildout:directory}/template.cfg
 mode = 0644
\ No newline at end of file

software/kvm/software.cfg

@@ -5,41 +5,46 @@ extends = common.cfg
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend
 websockify = 0.5.1
 
+slapos.toolbox = 0.48
 PyRSS2Gen = 1.1
-apache-libcloud = 0.16.0
+apache-libcloud = 0.17.0
 cns.recipe.symlink = 0.2.3
-collective.recipe.template = 1.11
-ecdsa = 0.11
-erp5.util = 0.4.42
+ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.7
-slapos.toolbox = 0.46.1
 smmap = 0.9.0
-z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.46.1
-GitPython = 0.3.6
+# slapos.toolbox==0.48
+GitPython = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.46.1
+# slapos.toolbox==0.48
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.46.1
-feedparser = 5.1.3
+# apache-libcloud==0.17.0
+backports.ssl-match-hostname = 3.4.0.2
 
 # Required by:
-# slapos.toolbox==0.46.1
+# slapos.toolbox==0.48
+feedparser = 5.2.0.post1
+
+# Required by:
+# slapos.toolbox==0.48
 lockfile = 0.10.2
 
 # Required by:
 # websockify==0.5.1
-numpy = 1.9.1
+numpy = 1.9.2
 
 # Required by:
-# slapos.toolbox==0.46.1
+# slapos.toolbox==0.48
 paramiko = 1.15.2
+
+# Required by:
+# slapos.toolbox==0.48
+rpdb = 0.1.5

software/wendelin/software.cfg

@@ -43,6 +43,7 @@ repository_id_list += wendelin
 [local-bt5-repository]
 # we need to override it
 list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${wendelin:location}/bt5/
+bt5_list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc erp5_configurator_ebusiness_lotse erp5_wendelin_configurator
 
 [wendelin]
 <= erp5
@@ -62,6 +63,6 @@ scipy = 0.15.1
 pandas = 0.16.1
 msgpack-python = 0.4.6
 numpy = 1.9.2
-wendelin.core = 0.2.post1
+wendelin.core = 0.3
 ipython = 3.1.0
 matplotlib = 1.4.3

stack/erp5/buildout.cfg

@@ -199,7 +199,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 0d777bfc8377e5b8ddc2e32a10f45b9b
+md5sum = 38d87bbb2b8193eb588b05ae6b8bbb3d
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -242,6 +242,7 @@ extra-context =
     key librsvg_location librsvg:location
     key libxcb_location libxcb:location
     key local_bt5_repository local-bt5-repository:list
+    key bt5_list local-bt5-repository:bt5_list
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
     key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
@@ -285,13 +286,13 @@ extra-context =
 [template-erp5-single]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
-md5sum = ee5ce422b52d1325f301a684ffc0eea3
+md5sum = 6dd76b8543347a11ebddcdc16dd98dd9 
 mode = 640
 
 [template-erp5-cluster]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
-md5sum = 2ff90bb68761b4930f92321f3b6ba590
+md5sum = 5080559723859b40a390d700431ffedd 
 mode = 640
 
 [template-varnish]
@@ -312,6 +313,7 @@ list = ${local-bt5-repository:list}
 # Same as bt5-repository, but only local repository.
 # Used to generate bt5lists.
 list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap
+bt5_list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc erp5_configurator_ebusiness_lotse
 
 [genbt5list]
 recipe = plone.recipe.command

stack/erp5/instance-erp5-cluster.cfg.in

@@ -84,12 +84,7 @@ kumofs-computer-guid = ${slap-connection:computer-id}
 tidstorage-computer-guid = ${slap-connection:computer-id}
 varnish-computer-guid = ${slap-connection:computer-id}
 cloudooo-json =
-bt5 = erp5_full_text_myisam_catalog
-  erp5_configurator_standard
-  erp5_configurator_maxma_demo
-  erp5_configurator_ung
-  erp5_configurator_run_my_doc
-  erp5_configurator_ebusiness_lotse
+bt5 = {{ bt5_list }}
 bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 

stack/erp5/instance-erp5-single.cfg.in

@@ -27,12 +27,7 @@ versions = versions
 site-id = erp5
 cloudooo-json =
 promise-path = ${rootdirectory:etc}/erp5promise.cfg
-bt5 = erp5_full_text_myisam_catalog
-  erp5_configurator_standard
-  erp5_configurator_maxma_demo
-  erp5_configurator_ung
-  erp5_configurator_run_my_doc
-  erp5_configurator_ebusiness_lotse
+bt5 = {{ bt5_list }}
 bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 

stack/erp5/instance.cfg.in

@@ -208,6 +208,7 @@ extra-context =
 bin-directory = {{ bin_directory }}
 openssl = {{ openssl_location }}
 local_bt5_repository = {{ local_bt5_repository  }}
+bt5_list = {{ bt5_list }}
 dash = {{ dash_location }}
 curl = {{ curl_location }}
 
@@ -225,9 +226,11 @@ extra-context =
     key dash_location template-erp5-single-parameters:dash
     key template_zope dynamic-template-zope:rendered
     key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
+    key bt5_list template-erp5-single-parameters:bt5_list
 
 [dynamic-template-cluster-parameters]
 local-bt5-repository = {{ local_bt5_repository }}
+bt5_list = {{ bt5_list }}
 
 [dynamic-template-cluster]
 < = jinja2-template-base
@@ -235,6 +238,7 @@ template = {{ template_erp5_cluster }}
 filename = instance-erp5-cluster.cfg
 extra-context =
     key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
+    key bt5_list template-erp5-single-parameters:bt5_list
 # Must match the key id in [switch-softwaretype] which uses this section.
 # XXX: it is dangerous to use buildout-style expansion in jinja context declaration
     raw software_type ${:software-type}