Fixes #4485 add an ipv6 parameter to accelerate so that the daemon will bind to an ipv6 port instead of ipv4
This commit is contained in:
parent
7b3fbeee16
commit
78f4f95e64
1 changed files with 24 additions and 4 deletions
|
@ -47,6 +47,12 @@ options:
|
|||
this number of minutes before turning itself off.
|
||||
required: false
|
||||
default: 30
|
||||
ipv6:
|
||||
description:
|
||||
- The listener daemon on the remote host will bind to the ipv6 localhost socket
|
||||
if this parameter is set to true.
|
||||
required: false
|
||||
default: false
|
||||
notes:
|
||||
- See the advanced playbooks chapter for more about using accelerated mode.
|
||||
requirements: [ "python-keyczar" ]
|
||||
|
@ -137,7 +143,7 @@ def daemonize_self(module, password, port, minutes):
|
|||
if pid > 0:
|
||||
vvv("exiting pid %s" % pid)
|
||||
# exit first parent
|
||||
module.exit_json(msg="daemonized accelerate on port %s for %s minutes" % (port, minutes))
|
||||
module.exit_json(msg="daemonized accelerate on port %s for %s minutes with pid %s" % (port, minutes, str(pid)))
|
||||
except OSError, e:
|
||||
log("fork #1 failed: %d (%s)" % (e.errno, e.strerror))
|
||||
sys.exit(1)
|
||||
|
@ -190,6 +196,15 @@ class ThreadedTCPServer(SocketServer.ThreadingTCPServer):
|
|||
self.timeout = timeout
|
||||
SocketServer.ThreadingTCPServer.__init__(self, server_address, RequestHandlerClass)
|
||||
|
||||
class ThreadedTCPV6Server(SocketServer.ThreadingTCPServer):
|
||||
def __init__(self, server_address, RequestHandlerClass, module, password, timeout):
|
||||
self.module = module
|
||||
self.address_family = socket.AF_INET6
|
||||
self.key = AesKey.Read(password)
|
||||
self.allow_reuse_address = True
|
||||
self.timeout = timeout
|
||||
SocketServer.ThreadingTCPServer.__init__(self, server_address, RequestHandlerClass)
|
||||
|
||||
class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
|
||||
def send_data(self, data):
|
||||
packed_len = struct.pack('!Q', len(data))
|
||||
|
@ -385,7 +400,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
|
|||
self.server.module.atomic_move(out_path, final_path)
|
||||
return dict()
|
||||
|
||||
def daemonize(module, password, port, timeout, minutes):
|
||||
def daemonize(module, password, port, timeout, minutes, ipv6):
|
||||
try:
|
||||
daemonize_self(module, password, port, minutes)
|
||||
|
||||
|
@ -395,7 +410,10 @@ def daemonize(module, password, port, timeout, minutes):
|
|||
signal.signal(signal.SIGALRM, catcher)
|
||||
signal.setitimer(signal.ITIMER_REAL, 60 * minutes)
|
||||
|
||||
server = ThreadedTCPServer(("0.0.0.0", port), ThreadedTCPRequestHandler, module, password, timeout)
|
||||
if ipv6:
|
||||
server = ThreadedTCPV6Server(("::", port), ThreadedTCPRequestHandler, module, password, timeout)
|
||||
else:
|
||||
server = ThreadedTCPServer(("0.0.0.0", port), ThreadedTCPRequestHandler, module, password, timeout)
|
||||
server.allow_reuse_address = True
|
||||
|
||||
vv("serving!")
|
||||
|
@ -410,6 +428,7 @@ def main():
|
|||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
port=dict(required=False, default=5099),
|
||||
ipv6=dict(required=False, default=False),
|
||||
timeout=dict(required=False, default=300),
|
||||
password=dict(required=True),
|
||||
minutes=dict(required=False, default=30),
|
||||
|
@ -423,13 +442,14 @@ def main():
|
|||
timeout = int(module.params['timeout'])
|
||||
minutes = int(module.params['minutes'])
|
||||
debug = int(module.params['debug'])
|
||||
ipv6 = bool(module.params['ipv6'])
|
||||
|
||||
if not HAS_KEYCZAR:
|
||||
module.fail_json(msg="keyczar is not installed (on the remote side)")
|
||||
|
||||
DEBUG_LEVEL=debug
|
||||
|
||||
daemonize(module, password, port, timeout, minutes)
|
||||
daemonize(module, password, port, timeout, minutes, ipv6)
|
||||
|
||||
# this is magic, see lib/ansible/module_common.py
|
||||
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
|
||||
|
|
Loading…
Reference in a new issue