parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Lint: E131 continuation line unaligned for hanging indent

This commit is contained in:
Joshua Boniface 2020-11-06 22:29:49 -05:00
parent 69858788c1
commit fad27a7f4d
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon-common/network.py
View File

@ -146,14 +146,14 @@ def getNetworkInformation(zk_conn, vni):
'network': ip6_network, 'network': ip6_network,
'gateway': ip6_gateway, 'gateway': ip6_gateway,
'dhcp_flag': dhcp6_flag, 'dhcp_flag': dhcp6_flag,
}, },
'ip4': { 'ip4': {
'network': ip4_network, 'network': ip4_network,
'gateway': ip4_gateway, 'gateway': ip4_gateway,
'dhcp_flag': dhcp4_flag, 'dhcp_flag': dhcp4_flag,
'dhcp_start': dhcp4_start, 'dhcp_start': dhcp4_start,
'dhcp_end': dhcp4_end 'dhcp_end': dhcp4_end
} }
} }
return network_information return network_information

21
node-daemon/pvcnoded/DNSAggregatorInstance.py
View File

@ -91,8 +91,7 @@ class PowerDNSInstance(object):
'--disable-syslog=yes', # Log only to stdout (which is then captured) '--disable-syslog=yes', # Log only to stdout (which is then captured)
'--disable-axfr=no', # Allow AXFRs '--disable-axfr=no', # Allow AXFRs
'--allow-axfr-ips=0.0.0.0/0', # Allow AXFRs to anywhere '--allow-axfr-ips=0.0.0.0/0', # Allow AXFRs to anywhere
'--local-address={},{}'.format(self.vni_ipaddr, self.upstream_ipaddr), '--local-address={},{}'.format(self.vni_ipaddr, self.upstream_ipaddr), # Listen on floating IPs
# Listen on floating IPs
'--local-port=53', # On port 53 '--local-port=53', # On port 53
'--log-dns-details=on', # Log details '--log-dns-details=on', # Log details
'--loglevel=3', # Log info '--loglevel=3', # Log info
@ -101,19 +100,13 @@ class PowerDNSInstance(object):
'--slave-renotify=yes', # Renotify out for our slaved zones '--slave-renotify=yes', # Renotify out for our slaved zones
'--version-string=powerdns', # Set the version string '--version-string=powerdns', # Set the version string
'--default-soa-name=dns.pvc.local', # Override dnsmasq's invalid name '--default-soa-name=dns.pvc.local', # Override dnsmasq's invalid name
'--socket-dir={}'.format(self.config['pdns_dynamic_directory']), '--socket-dir={}'.format(self.config['pdns_dynamic_directory']), # Standard socket directory
# Standard socket directory
'--launch=gpgsql', # Use the PostgreSQL backend '--launch=gpgsql', # Use the PostgreSQL backend
'--gpgsql-host={}'.format(self.config['pdns_postgresql_host']), '--gpgsql-host={}'.format(self.config['pdns_postgresql_host']), # PostgreSQL instance
# PostgreSQL instance '--gpgsql-port={}'.format(self.config['pdns_postgresql_port']), # Default port
'--gpgsql-port={}'.format(self.config['pdns_postgresql_port']), '--gpgsql-dbname={}'.format(self.config['pdns_postgresql_dbname']), # Database name
# Default port '--gpgsql-user={}'.format(self.config['pdns_postgresql_user']), # User name
'--gpgsql-dbname={}'.format(self.config['pdns_postgresql_dbname']), '--gpgsql-password={}'.format(self.config['pdns_postgresql_password']), # User password
# Database name
'--gpgsql-user={}'.format(self.config['pdns_postgresql_user']),
# User name
'--gpgsql-password={}'.format(self.config['pdns_postgresql_password']),
# User password
'--gpgsql-dnssec=no', # Do DNSSEC elsewhere '--gpgsql-dnssec=no', # Do DNSSEC elsewhere
] ]
# Start the pdns process in a thread # Start the pdns process in a thread

4
node-daemon/pvcnoded/log.py
View File

@ -43,7 +43,7 @@ class Logger(object):
# Format maps # Format maps
format_map_colourized = { format_map_colourized = {
# Colourized formatting with chevron prompts (log_colours = True) # Colourized formatting with chevron prompts (log_colours = True)
'o': { 'colour': fmt_green, 'prompt': '>>> ' }, 'o': { 'colour': fmt_green, 'prompt': '>>> ' },
'e': { 'colour': fmt_red, 'prompt': '>>> ' }, 'e': { 'colour': fmt_red, 'prompt': '>>> ' },
'w': { 'colour': fmt_yellow, 'prompt': '>>> ' }, 'w': { 'colour': fmt_yellow, 'prompt': '>>> ' },
@ -54,7 +54,7 @@ class Logger(object):
'x': { 'colour': last_colour, 'prompt': last_prompt } 'x': { 'colour': last_colour, 'prompt': last_prompt }
} }
format_map_textual = { format_map_textual = {
# Uncolourized formatting with text prompts (log_colours = False) # Uncolourized formatting with text prompts (log_colours = False)
'o': { 'colour': '', 'prompt': 'ok: ' }, 'o': { 'colour': '', 'prompt': 'ok: ' },
'e': { 'colour': '', 'prompt': 'failed: ' }, 'e': { 'colour': '', 'prompt': 'failed: ' },
'w': { 'colour': '', 'prompt': 'warning: ' }, 'w': { 'colour': '', 'prompt': 'warning: ' },