tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Add missing configuration arg

Browse source
This commit is contained in:
Darko Poljak 2019-01-28 16:35:02 +01:00
parent a094679173
commit 1a5cc67cc8
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cdist/config.py
View file

@ -144,7 +144,7 @@ class Config(object):
# Determine forcing IPv4/IPv6 options if any, only for # Determine forcing IPv4/IPv6 options if any, only for
# default remote commands. # default remote commands.
if hasattr(args, 'force_ipv') and args.force_ipv: if args.force_ipv:
force_addr_opt = " -{}".format(args.force_ipv) force_addr_opt = " -{}".format(args.force_ipv)
else: else:
force_addr_opt = "" force_addr_opt = ""
@ -357,15 +357,12 @@ class Config(object):
@staticmethod @staticmethod
def _address_family(args): def _address_family(args):
if hasattr(args, 'force_ipv'):
if args.force_ipv == 4: if args.force_ipv == 4:
family = socket.AF_INET family = socket.AF_INET
elif args.force_ipv == 6: elif args.force_ipv == 6:
family = socket.AF_INET6 family = socket.AF_INET6
else: else:
family = 0 family = 0
else:
family = 0
return family return family
@staticmethod @staticmethod

5
cdist/trigger.py
View file

@ -200,8 +200,11 @@ class TriggerHttp(http.server.BaseHTTPRequestHandler):
log.debug("Executing cdist onehost with params: %s, %s, %s, %s, %s, ", log.debug("Executing cdist onehost with params: %s, %s, %s, %s, %s, ",
target_host, host_tags, host_base_path, hostdir, target_host, host_tags, host_base_path, hostdir,
self.cdistargs) self.cdistargs)
cfg = cdist.configuration.Configuration(self.cdistargs)
configuration = cfg.get_config(section='GLOBAL')
theclass.onehost(target_host, host_tags, host_base_path, hostdir, theclass.onehost(target_host, host_tags, host_base_path, hostdir,
self.cdistargs, parallel=False) self.cdistargs, parallel=False,
configuration=configuration)
class HTTPServerV6(socketserver.ForkingMixIn, http.server.HTTPServer): class HTTPServerV6(socketserver.ForkingMixIn, http.server.HTTPServer):