x/tobiko
Code Issues Proposed changes

Merge "Avoid using sudo for reading L3 conf file on localhost"

Browse Source
This commit is contained in:
Zuul 2022-07-20 13:00:56 +00:00 committed by Gerrit Code Review
commit 18e30f0d98
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tobiko/openstack/neutron/_agent.py
View File

@ -84,13 +84,16 @@ def list_dhcp_agent_hosting_network(network, client=None, **params):
def get_l3_agent_mode( def get_l3_agent_mode(
l3_agent_conf_path: str, l3_agent_conf_path: str,
default='legacy', default='legacy',
connection: sh.ShellConnectionType = None) -> str: connection: sh.ShellConnectionType = None,
sudo: bool = None) -> str:
connection = sh.shell_connection(connection) connection = sh.shell_connection(connection)
LOG.debug(f"Read L3 agent mode from file '{l3_agent_conf_path}' on host " LOG.debug(f"Read L3 agent mode from file '{l3_agent_conf_path}' on host "
f" '{connection.hostname}'...") f" '{connection.hostname}'...")
if sudo is None:
sudo = not connection.is_local
with sh.open_file(l3_agent_conf_path, 'rt', with sh.open_file(l3_agent_conf_path, 'rt',
connection=connection, connection=connection,
sudo=True) as fd: sudo=sudo) as fd:
LOG.debug(f"Parse ini file '{l3_agent_conf_path}'...") LOG.debug(f"Parse ini file '{l3_agent_conf_path}'...")
content = tobiko.parse_ini_file(fd) content = tobiko.parse_ini_file(fd)
try: try: