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

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.252'
+version = '1.0.253'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/pbs.py

@@ -226,13 +226,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
       (self.options['sshclient-binary'],
        parsed_url.username, parsed_url.hostname, parsed_url.port)))
 
-    # Create known_hosts file by default.
-    # In some case, we don't want to create it (case where we share IP mong partitions)
-    if not self.isTrueValue(self.options.get('ignore-known-hosts-file')):
-      # Migration code: if known_hosts file contains entry with just IP, then it
-      # is updated to use [IP]:port. It allows to share same IP among partitions
-      if parsed_url.hostname in known_hosts_file:
-        del known_hosts_file[parsed_url.hostname]
+    # Create known_hosts file
     known_hostname = "[%s]:%s" % (parsed_url.hostname, parsed_url.port)
     known_hosts_file[known_hostname] = entry['server-key'].strip()
 

software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2

@@ -52,7 +52,6 @@ config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
 config-virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
 config-resiliency-backup-periodicity = */5 * * * *
 config-resilient-clone-number = 1
-config-ignore-known-hosts-file = false
 return = ipv6
 # XXX What to do?
 sla-computer_guid = ${slap-connection:computer-id}

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

@@ -56,13 +56,6 @@
           "type": "string",
           "default": "2W",
           "optional": true
-        },
-        "ignore-known-hosts-file": {
-          "title": "Ignore known_hosts file",
-          "description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).",
-          "type": "boolean",
-          "default": false,
-          "optional": true
         }
       }
     }

software/slaprunner/instance-runner-resilient-input-schema.json

@@ -58,13 +58,6 @@
           "type": "string",
           "default": "2W",
           "optional": true
-        },
-        "ignore-known-hosts-file": {
-          "title": "Ignore known_hosts file",
-          "description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).",
-          "type": "boolean",
-          "default": false,
-          "optional": true
         }
       }
     }

software/theia/instance-resilient-input-schema.json

@@ -59,13 +59,6 @@
           "type": "string",
           "default": "2W",
           "optional": true
-        },
-        "ignore-known-hosts-file": {
-          "title": "Ignore known_hosts file",
-          "description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, theia).",
-          "type": "boolean",
-          "default": false,
-          "optional": true
         }
       }
     }

stack/resilient/buildout.hash.cfg

@@ -26,11 +26,11 @@ md5sum = 2ef471242ab1fe9d0998f49304bfa066
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 44a3166048a81d0d76d69527b1934ef7
+md5sum = 1b8645835f04081861266436505fd28f
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = 2eea3b0227c3ae9e44cfc41df9930fa7
+md5sum = ba90373d7ba062a6b8117b821a2d7765
 
 [template-parts]
 filename = template-parts.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -124,7 +124,6 @@ pull-push-maximum-run = 5
 # XXX: this should be named "notifier-host"
 notifier-url = http://[$${notifier:host}]:$${notifier:port}
 slave-instance-list = {{ dumps(slave_instance_list) }}
-ignore-known-hosts-file = {{ slapparameter_dict.get('ignore-known-hosts-file', 'false') }}
 # To get a verbose feed about PBS state
 instance-root-name = $${monitor-instance-parameter:root-instance-title}
 log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/

stack/resilient/template-replicated.cfg.in

@@ -196,7 +196,6 @@ software-type = pull-backup
 [request-pbs-{{namebase}}-{{id}}]
 <= request-pbs-common
 name = PBS ({{namebase}} / {{id}})
-config-ignore-known-hosts-file = ${slap-parameter:ignore-known-hosts-file}
 config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
 {% for key, value in six.iteritems(monitor_dict) -%}
 config-{{ key }} = {{ value }}
@@ -294,6 +293,5 @@ sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
 {{namebase}}{{id}}-computer-guid =
 pbs-{{namebase}}{{id}}-computer-guid =
 {% endfor %}
-ignore-known-hosts-file = false
 
 {% endmacro %}

stack/slapos.cfg

@@ -194,7 +194,7 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.12.0
-slapos.cookbook = 1.0.252
+slapos.cookbook = 1.0.253
 slapos.core = 1.7.9
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0