Update Release Candidate

slapos/recipe/re6stnet/re6stnet.py

@@ -93,7 +93,7 @@ def requestRemoveToken(client, token_base_path):
       reference = reference_key.split('.')[0]
       try:
         result = client.deleteToken(token)
-      except httplib.NOTFOUND:
+      except httplib.NOT_FOUND:
         # Token is alread removed.
         result = True
       except Exception:

software/caddy-frontend/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 72e8ff0773fd0325dcbe994786156570
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 99ec567c429ff82571d08818eaaed390
+md5sum = 6ef06ef36dbb0c3ba1ea8841bcd49330
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
@@ -98,7 +98,7 @@ md5sum = 061cc244558fd3af2b6bacf17cae5555
 
 [template-validate-script]
 filename = templates/validate-script.sh.in
-md5sum = 89839a3f4ab71cab459afd1c27d00326
+md5sum = f26e11574f266c7437c9c89e3c93825a
 
 [template-configuration-state-script]
 filename = templates/configuration-state-script.sh.in
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = bb68849a97b0305bef149d6aed33a804
+md5sum = 299cea88789c8904e0e4414a55fd3a5c

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -295,7 +295,7 @@ software-url = ${slap-connection:software-release-url}
 {% endif %}
 software-type = kedifa
 name = kedifa
-return = slave-kedifa-information master-key-generate-auth-url master-key-upload-url master-key-download-url caucase-url csr_id-url csr_id-certificate
+return = slave-kedifa-information master-key-generate-auth-url master-key-upload-url master-key-download-url caucase-url csr_id-url csr_id-certificate  monitor-base-url
 {% set sla_kedifa_key = "-sla-kedifa-" %}
 {% set sla_kedifa_key_length = sla_kedifa_key | length %}
 {% for key in slapparameter_dict.keys() %}
@@ -342,6 +342,7 @@ extra-context =
 
 [monitor-conf-parameters]
 monitor-url-list +=
+  ${request-kedifa:connection-monitor-base-url}
 {% for frontend in frontend_section_list %}
 {{ '  ${' + frontend + ':connection-monitor-base-url}' }}
 {% endfor %}

software/caddy-frontend/instance-kedifa.cfg.in

@@ -10,7 +10,7 @@ parts =
   monitor-base
   directory
   kedifa
-  promise-kedifa-listen-ip-port
+  promise-kedifa-http-reply
   slave-kedifa-information
   caucased
   caucased-promise
@@ -219,12 +219,14 @@ recipe = slapos.cookbook:wrapper
 command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}`
 wrapper-path = ${directory:etc-run}/kedifa-reloader
 
-[promise-kedifa-listen-ip-port]
+[promise-kedifa-http-reply]
 <= promise-plugin-base
-module = check_port_listening
-name = kedifa-ip-port-listening.py
-config-hostname = ${kedifa-config:ip}
-config-port = ${kedifa-config:port}
+module = check_url_available
+name = kedifa-http-reply.py
+# Kedifa replies 500 on /, so use it to be sure that Kedifa replied
+config-http_code = 500
+config-url = https://[${kedifa-config:ip}]:${kedifa-config:port}
+config-ca-cert-file = ${kedifa-config:ca-certificate}
 
 [kedifa]
 recipe = slapos.cookbook:wrapper

software/caddy-frontend/templates/validate-script.sh.in

@@ -5,9 +5,12 @@ set -e
 LAST_STATE_FILE={{ last_state_file }}
 
 # force validation each 2 hours
-[ -f $LAST_STATE_FILE ] && find $LAST_STATE_FILE -mmin +120 -delete
-configuration_state=$({{ caddy_configuration_state }})
-if [ ! -f $LAST_STATE_FILE ] || $configuration_state ; then
+old_found=1
+if [ -f $LAST_STATE_FILE ] ; then
+  old_found=$(find $LAST_STATE_FILE -mmin +120 | wc -l)
+fi
+
+if [ "$old_found" -eq 1 ] || {{ caddy_configuration_state }} ; then
   # do not catch errors during validation
   set +e
   {{ wrapper }} -validate

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt

@@ -7,6 +7,6 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt

@@ -7,6 +7,6 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[deploy-script-controller-script]
+filename = deploy-script-controller
+md5sum = f0f5dd379361eb37f84e0bc7639f645f
+
+[template-deploy-test]
+filename = instance.cfg.in
+md5sum = 616abb7fb4608321e11ade0a43b0ce4b

software/erp5testnode/testsuite/deploy-test/software.cfg

 [buildout]
-extends = https://lab.nexedi.com/nexedi/slapos/raw/1.0.112/software/kvm/software.cfg
+extends =
+  buildout.hash.cfg
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0.112/software/kvm/software.cfg
 
 # PyPi servers from new host since some time and change is not incorporated in extended KVM SR
 allow-hosts +=
@@ -57,9 +59,7 @@ git-executable = ${git:location}/bin/git
 output = ${buildout:directory}/template-original.kvm.cfg
 
 [deploy-script-controller-script]
-filename = deploy-script-controller
 location = ${:_profile_base_location_}/${:filename}
-md5sum = f0f5dd379361eb37f84e0bc7639f645f
 # configuration
 waittime = 360
 tries = 80
@@ -70,9 +70,8 @@ location = ${:_profile_base_location_}/${:filename}
 
 [template-deploy-test]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
-md5sum = 616abb7fb4608321e11ade0a43b0ce4b
 mode = 0644
 
 [versions]

software/re6stnet/re6st-registry.conf.in

 port  {{ parameter_dict['port'] }}
 4  {{ parameter_dict['ipv4'] }}
+authorized-origin  {{ parameter_dict['ipv4'] }}
 # 6  {{ parameter_dict['ipv6'] }}
 db  {{ parameter_dict['db'] }}
 ca  {{ parameter_dict['ca'] }}
@@ -28,4 +29,4 @@ max-clients {{ parameter_dict['max-clients'] }}
 {% endif -%}
 {% if parameter_dict.get('same-country') -%}
 same-country {{ parameter_dict['same-country'] }}
-{% endif -%}
+{% endif -%}
\ No newline at end of file

software/re6stnet/software.cfg

@@ -96,7 +96,7 @@ md5sum = d64cafda1139b740a49a9f5e30a1b57b
 [template-re6st-registry-conf]
 < = download-base
 filename = re6st-registry.conf.in
-md5sum = b85375cd45c5f2fb0d68e449ae70e2a1
+md5sum = b0f0facfea82a4481f4fb5b0b263e09a
 
 [template-wrapper]
 < = download-base

software/slaprunner/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = a5e2ae493b78a0f42d61cc79a0b2e686
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = ed6dc50713c14e2527b9958d98674eed
+md5sum = 3c80e21dda146b4cbee103b0a3f6935b
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in

software/slaprunner/template/runner-import.sh.jinja2

@@ -250,6 +250,7 @@ do
 done
 
 # Change back slapproxy database to have all instances started
+DB_PARTITION_TABLE=$(db_query ".table partition__")
 log_message "Set instances as to start after takeover..."
 db_query "update $DB_PARTITION_TABLE set requested_state='started';"