diff options
author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-05 17:35:20 +0100 |
---|---|---|
committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-06 20:22:35 +0100 |
commit | 1f144f7d9a0a3f1cb6010632a5b3625435a17550 (patch) | |
tree | 2a6ff98a026e7a3f7aaef6afa058112290c112e5 | |
parent | 1c85a72fc338dab5266cff6faffd12f1505512c9 (diff) | |
download | vyos-1x-1f144f7d9a0a3f1cb6010632a5b3625435a17550.tar.gz vyos-1x-1f144f7d9a0a3f1cb6010632a5b3625435a17550.zip |
util: T2226: rewrite vrrp to use run
-rwxr-xr-x | src/conf_mode/vrrp.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py index 8683faca7..d3e3710d1 100755 --- a/src/conf_mode/vrrp.py +++ b/src/conf_mode/vrrp.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import os -import subprocess from sys import exit from ipaddress import ip_address, ip_interface, IPv4Interface, IPv6Interface, IPv4Address, IPv6Address @@ -28,6 +27,7 @@ import vyos.keepalived from vyos.defaults import directories as vyos_data_dir from vyos import ConfigError +from vyos.util import run daemon_file = "/etc/default/keepalived" config_file = "/etc/keepalived/keepalived.conf" @@ -242,17 +242,17 @@ def apply(data): if not vyos.keepalived.vrrp_running(): print("Starting the VRRP process") - ret = subprocess.call("sudo systemctl restart keepalived.service", shell=True) + ret = run("sudo systemctl restart keepalived.service") else: print("Reloading the VRRP process") - ret = subprocess.call("sudo systemctl reload keepalived.service", shell=True) + ret = run("sudo systemctl reload keepalived.service") if ret != 0: raise ConfigError("keepalived failed to start") else: # VRRP is removed in the commit print("Stopping the VRRP process") - subprocess.call("sudo systemctl stop keepalived.service", shell=True) + run("sudo systemctl stop keepalived.service") os.unlink(config_file) return None |