diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-22 07:22:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 07:22:14 +0200 |
| commit | a3a4d23ff557216bd9b11b5653457f2b95251301 (patch) | |
| tree | ae8cc0f8cae29a0c059d5c16097dd1d5dcdde75d | |
| parent | ffc065158dc875d15d55df8b32a0a33b643e4202 (diff) | |
| parent | a0be6df0aa6fbbb988f264eb4981d00d60e19476 (diff) | |
| download | vyos-1x-a3a4d23ff557216bd9b11b5653457f2b95251301.tar.gz vyos-1x-a3a4d23ff557216bd9b11b5653457f2b95251301.zip | |
Merge pull request #370 from thomas-mangin/T2331
vrrp: T2331: fix show vrrp
| -rw-r--r-- | python/vyos/ifconfig/vrrp.py | 2 | ||||
| -rwxr-xr-x | src/op_mode/vrrp.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/python/vyos/ifconfig/vrrp.py b/python/vyos/ifconfig/vrrp.py index 29b10dd9e..a872725b2 100644 --- a/python/vyos/ifconfig/vrrp.py +++ b/python/vyos/ifconfig/vrrp.py @@ -109,7 +109,7 @@ class VRRP(object): return [] disabled = [] - config = json.loads(util.readfile(cls.location['vyos'])) + config = json.loads(util.read_file(cls.location['vyos'])) # add disabled groups to the list for group in config['vrrp_groups']: diff --git a/src/op_mode/vrrp.py b/src/op_mode/vrrp.py index 923cfa4d4..e024d7f63 100755 --- a/src/op_mode/vrrp.py +++ b/src/op_mode/vrrp.py @@ -21,7 +21,6 @@ import argparse import json import tabulate -import vyos.keepalived import vyos.util from vyos.ifconfig.vrrp import VRRP |