Commit 57b6ae84 authored by Jérome Perrin's avatar Jérome Perrin

Update Release Candidate

parents 7d1fe972 bff416ce
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '1.0.252' version = '1.0.253'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.rst").read() long_description = open("README.rst").read()
......
...@@ -226,13 +226,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback): ...@@ -226,13 +226,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
(self.options['sshclient-binary'], (self.options['sshclient-binary'],
parsed_url.username, parsed_url.hostname, parsed_url.port))) parsed_url.username, parsed_url.hostname, parsed_url.port)))
# Create known_hosts file by default. # Create known_hosts file
# 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]
known_hostname = "[%s]:%s" % (parsed_url.hostname, parsed_url.port) known_hostname = "[%s]:%s" % (parsed_url.hostname, parsed_url.port)
known_hosts_file[known_hostname] = entry['server-key'].strip() known_hosts_file[known_hostname] = entry['server-key'].strip()
......
...@@ -194,7 +194,7 @@ setproctitle = 1.1.10 ...@@ -194,7 +194,7 @@ setproctitle = 1.1.10
setuptools-dso = 1.7 setuptools-dso = 1.7
rubygemsrecipe = 0.4.3 rubygemsrecipe = 0.4.3
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.246 slapos.cookbook = 1.0.252
slapos.core = 1.7.9 slapos.core = 1.7.9
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment