Merge remote-tracking branch 'upstream/master' into zope4py2

software/caddy-frontend/buildout.hash.cfg

@@ -102,7 +102,7 @@ md5sum = 1c866272ec0ea0c161f0c0d80cb6e584
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = b757e0409ec3e70679a8fc4aab4a065f
+md5sum = 40fe46a1fe653406b18ca46351d195b8
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

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

@@ -280,9 +280,19 @@ command =
   [ ! -f ${:file} ] && {{ software_parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
 update-command = ${:command}
 
-[auth-random]
+[cleanup-auth-ready]
+# Cleans auth-ready as some slaves can appear and be configured, but then
+# become removed before auth-random kicks in
 recipe = slapos.recipe.build
 directory = ${directory:auth-ready}
+init =
+  import os
+  if os.path.isdir(options['directory']):
+    os.system("find %s -type f -name *-auth-random -size 0 -delete" % (options['directory'],))
+
+[auth-random]
+recipe = slapos.recipe.build
+directory = ${cleanup-auth-ready:directory}
 auth-ready = ${directory:auth-ready}/${:_buildout_section_name_}
 init =
   import os

software/kvm/README.rst

@@ -69,8 +69,6 @@ KVM instance parameters:
     MD5Sum of image disk to download
 - virtual-hard-drive-gzipped (default: False)
     Compress image to reduce size with gzip (.gz)
-- hard-drive-url-check-certificate (default: True)
-    if virtual-hard-drive-url use self-signed https, then specify if https certificate should be verified or not
 
 - enable-http-server (default: False)
     Configure server that will help to get some files into the vm from http

software/kvm/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = a7978940fb9cdcc4e1ec33015ba640ba
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 150285957daa256420d2d73519277420
+md5sum = d790827b6199aa5aada5fe7acb8f1a7b
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = c00608f94ff6cfd8d37a280267c7227f
+md5sum = 4919254d85b98659c1be2ae631b99a13
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
@@ -55,7 +55,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
 
 [template-kvm-run]
 filename = template/template-kvm-run.in
-md5sum = 7da4fcd815cb7abe318d8ac4b98c8cf3
+md5sum = fa048a28da7362d570f5b6bd1e05d232
 
 [template-kvm-controller]
 filename = template/kvm-controller-run.in
@@ -79,7 +79,7 @@ md5sum = 438192aab9f11e40dc521b46a4854dcf
 
 [image-download-controller]
 filename = template/image-download-controller.py.in
-md5sum = dc822ddd7dc987bf808a64a18ba11fd0
+md5sum = 9636903e683e4712e313ca2c470cfb94
 
 [image-download-config-creator]
 filename = template/image-download-config-creator.py.in

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

@@ -386,12 +386,6 @@
               "type": "boolean",
               "default": false
             },
-            "hard-drive-url-check-certificate": {
-              "title": "Check certificate when downloading virtual hard drive from https.",
-              "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
-              "type": "boolean",
-              "default": true
-            },
             "wipe-disk-ondestroy": {
               "title": "Wipe disks when destroy the VM",
               "description": "Say if disks should be wiped by writing new data over every single bit before delete them. This option is used to securely delete VM disks",

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

@@ -117,7 +117,6 @@ config-enable-vhost = {{ dumps(kvm_parameter_dict.get('enable-vhost', False)) }}
 {{ setconfig('virtual-hard-drive-url', kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
 {{ setconfig('virtual-hard-drive-md5sum', kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
 config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-gzipped', False)) }}
-config-hard-drive-url-check-certificate = {{ dumps(kvm_parameter_dict.get('hard-drive-url-check-certificate', True)) }}
 config-external-disk-number = {{ dumps(kvm_parameter_dict.get('external-disk-number', 0)) }}
 config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size', 20)) }}
 config-external-disk-format = {{ dumps(kvm_parameter_dict.get('external-disk-format', 'qcow2')) }}

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

@@ -187,12 +187,6 @@
       "type": "boolean",
       "default": false
     },
-    "hard-drive-url-check-certificate": {
-      "title": "Check certificate when downloading virtual hard drive from https.",
-      "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
-      "type": "boolean",
-      "default": true
-    },
     "wipe-disk-ondestroy": {
       "title": "Wipe disks when destroy the VM",
       "description": "Say if disks should be wiped by writing new data over every single bit before delete them. This option is used to securely delete VM disks",

software/kvm/instance-kvm.cfg.jinja2

@@ -457,7 +457,6 @@ enable-vhost = ${slap-parameter:enable-vhost}
 virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
 virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
 virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
-hard-drive-url-check-certificate = ${slap-parameter:hard-drive-url-check-certificate}
 
 shell-path = {{ dash_executable_location }}
 qemu-path =  {{ qemu_executable_location }}
@@ -1091,8 +1090,6 @@ enable-vhost = False
 virtual-hard-drive-url =
 virtual-hard-drive-md5sum =
 virtual-hard-drive-gzipped = False
-# if virtual-hard-drive-url use https, then specify if https certificate should be checked or not
-hard-drive-url-check-certificate = True
 
 external-disk-number = 0
 external-disk-size = 20

software/kvm/template/image-download-controller.py.in

@@ -95,7 +95,6 @@ if __name__ == "__main__":
     try:
       subprocess.check_output([
         curl,
-        '--insecure',  # allow any download
         '--location',  # follow redirects
         '--no-progress-meter',  # do not tell too much
         '--max-time', '14400',  # maximum time for download is 4 hours

software/kvm/template/template-kvm-run.in

@@ -59,7 +59,6 @@ httpd_port = {{ parameter_dict.get("httpd-port") }}
 netcat_bin = '{{ parameter_dict.get("netcat-binary") }}'.strip()
 cluster_doc_host = '{{ parameter_dict.get("cluster-doc-host") }}'
 cluster_doc_port = {{ parameter_dict.get("cluster-doc-port") }}
-url_check_certificate = '{{ parameter_dict.get("hard-drive-url-check-certificate", "true") }}'.lower()
 auto_ballooning = '{{ parameter_dict.get("auto-ballooning") }}' in ('true', 'True', '1')
 vm_name = '{{ parameter_dict.get("name") }}'
 

software/kvm/test/test.py

@@ -103,7 +103,6 @@ bootstrap_machine_param_dict = {
     "e1f67a7ef7b96",
     "virtual-hard-drive-md5sum": "9ffd690a5fcb4fa56702f2b99183e493",
     "virtual-hard-drive-gzipped": True,
-    "hard-drive-url-check-certificate": False,
     "use-tap": True,
     "use-nat": True,
     "nat-restrict-mode": True,