x/packstack
Code Issues Proposed changes

IPv6 fixes

Browse Source 
This patch makes validate_ssh works for IPv6 addresses.Also file
transport via scp has been fixed to work via IPv6 address

Change-Id: I55c88d3fcaaa8decd647aa38404ac653d5f5dbba
This commit is contained in:
Martin Mágr
2015-01-23 13:08:32 +01:00
parent e95720f57b
commit 7f5af0708b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/installer/validators.py
View File

@@ -138,7 +138,7 @@ def validate_ip(param, options=None):
for family in (socket.AF_INET, socket.AF_INET6): for family in (socket.AF_INET, socket.AF_INET6):
try: try:
socket.inet_pton(family, param) socket.inet_pton(family, param)
break return family
except socket.error: except socket.error:
continue continue
else: else:
@@ -213,7 +213,7 @@ def touch_port(host, port):
key = "%s:%d" % (host, port) key = "%s:%d" % (host, port)
if key in _tested_ports: if key in _tested_ports:
return return
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(validate_ip(host), socket.SOCK_STREAM)
s.connect((host, port)) s.connect((host, port))
s.shutdown(socket.SHUT_RDWR) s.shutdown(socket.SHUT_RDWR)
s.close() s.close()

4
packstack/plugins/puppet_950.py
View File

@@ -85,7 +85,7 @@ def wait_for_puppet(currently_running, messages):
log = log.replace(".finished", ".log") log = log.replace(".finished", ".log")
local_server.append('scp -o StrictHostKeyChecking=no ' local_server.append('scp -o StrictHostKeyChecking=no '
'-o UserKnownHostsFile=/dev/null ' '-o UserKnownHostsFile=/dev/null '
'root@%s:%s %s' 'root@[%s]:%s %s'
% (hostname, finished_logfile, log)) % (hostname, finished_logfile, log))
# To not pollute logs we turn of logging of command execution # To not pollute logs we turn of logging of command execution
local_server.execute(log=False) local_server.execute(log=False)
@@ -209,7 +209,7 @@ def copy_puppet_modules(config, messages):
for path, localname in resources.get(hostname, []): for path, localname in resources.get(hostname, []):
server.append("scp -o StrictHostKeyChecking=no " server.append("scp -o StrictHostKeyChecking=no "
"-o UserKnownHostsFile=/dev/null " "-o UserKnownHostsFile=/dev/null "
"%s root@%s:%s/resources/%s" % "%s root@[%s]:%s/resources/%s" %
(path, hostname, host_dir, localname)) (path, hostname, host_dir, localname))
# copy Puppet modules required by Packstack # copy Puppet modules required by Packstack