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

Fix linting error F541 f-string placeholders

This commit is contained in:
Joshua Boniface 2021-11-06 03:26:03 -04:00
parent 66230ce971
commit 73e3746885
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-daemon/pvcnoded/util/fencing.py
View File

@ -197,7 +197,7 @@ def reboot_via_ipmi(ipmi_hostname, ipmi_user, ipmi_password, logger):
f"Current chassis power state is: {ipmi_status_stdout.strip()}", state="i" f"Current chassis power state is: {ipmi_status_stdout.strip()}", state="i"
) )
else: else:
logger.out(f"Current chassis power state is: Unknown", state="w") logger.out("Current chassis power state is: Unknown", state="w")
# Power on the node # Power on the node
logger.out("Sending power on to dead node", state="i") logger.out("Sending power on to dead node", state="i")

14
node-daemon/pvcnoded/util/networking.py
View File

@ -92,7 +92,7 @@ def setup_interfaces(logger, config):
state="i", state="i",
) )
common.run_os_command(f"brctl addbr brcluster") common.run_os_command("brctl addbr brcluster")
common.run_os_command(f"brctl addif brcluster {cluster_dev}") common.run_os_command(f"brctl addif brcluster {cluster_dev}")
common.run_os_command(f"ip link set brcluster mtu {cluster_mtu} up") common.run_os_command(f"ip link set brcluster mtu {cluster_mtu} up")
common.run_os_command(f"ip address add {cluster_dev_ip} dev brcluster") common.run_os_command(f"ip address add {cluster_dev_ip} dev brcluster")
@ -123,7 +123,7 @@ def setup_interfaces(logger, config):
state="i", state="i",
) )
common.run_os_command(f"brctl addbr brstorage") common.run_os_command("brctl addbr brstorage")
common.run_os_command(f"brctl addif brstorage {storage_dev}") common.run_os_command(f"brctl addif brstorage {storage_dev}")
common.run_os_command(f"ip link set brstorage mtu {storage_mtu} up") common.run_os_command(f"ip link set brstorage mtu {storage_mtu} up")
common.run_os_command(f"ip address add {storage_dev_ip} dev brstorage") common.run_os_command(f"ip address add {storage_dev_ip} dev brstorage")
@ -152,7 +152,7 @@ def setup_interfaces(logger, config):
state="i", state="i",
) )
common.run_os_command(f"brctl addbr brupstream") common.run_os_command("brctl addbr brupstream")
common.run_os_command(f"brctl addif brupstream {upstream_dev}") common.run_os_command(f"brctl addif brupstream {upstream_dev}")
common.run_os_command(f"ip link set brupstream mtu {upstream_mtu} up") common.run_os_command(f"ip link set brupstream mtu {upstream_mtu} up")
common.run_os_command(f"ip address add {upstream_dev_ip} dev brupstream") common.run_os_command(f"ip address add {upstream_dev_ip} dev brupstream")
@ -188,13 +188,13 @@ def setup_interfaces(logger, config):
common.run_os_command("sysctl net.ipv6.conf.default.accept_source_route=1") common.run_os_command("sysctl net.ipv6.conf.default.accept_source_route=1")
# Disable RP filtering on Cluster and Upstream interfaces (to allow traffic pivoting) # Disable RP filtering on Cluster and Upstream interfaces (to allow traffic pivoting)
common.run_os_command(f"sysctl net.ipv4.conf.{cluster_dev}.rp_filter=0") common.run_os_command(f"sysctl net.ipv4.conf.{cluster_dev}.rp_filter=0")
common.run_os_command(f"sysctl net.ipv4.conf.brcluster.rp_filter=0") common.run_os_command("sysctl net.ipv4.conf.brcluster.rp_filter=0")
common.run_os_command(f"sysctl net.ipv4.conf.{upstream_dev}.rp_filter=0") common.run_os_command(f"sysctl net.ipv4.conf.{upstream_dev}.rp_filter=0")
common.run_os_command(f"sysctl net.ipv4.conf.brupstream.rp_filter=0") common.run_os_command("sysctl net.ipv4.conf.brupstream.rp_filter=0")
common.run_os_command(f"sysctl net.ipv6.conf.{cluster_dev}.rp_filter=0") common.run_os_command(f"sysctl net.ipv6.conf.{cluster_dev}.rp_filter=0")
common.run_os_command(f"sysctl net.ipv6.conf.brcluster.rp_filter=0") common.run_os_command("sysctl net.ipv6.conf.brcluster.rp_filter=0")
common.run_os_command(f"sysctl net.ipv6.conf.{upstream_dev}.rp_filter=0") common.run_os_command(f"sysctl net.ipv6.conf.{upstream_dev}.rp_filter=0")
common.run_os_command(f"sysctl net.ipv6.conf.brupstream.rp_filter=0") common.run_os_command("sysctl net.ipv6.conf.brupstream.rp_filter=0")
# Stop DNSMasq if it is running # Stop DNSMasq if it is running
common.run_os_command("systemctl stop dnsmasq.service") common.run_os_command("systemctl stop dnsmasq.service")