summaryrefslogtreecommitdiff
path: root/smoketest/scripts/cli
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-21 20:29:36 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-21 20:32:57 +0200
commitb243795eba1b36cadd81c3149e833bdf5c5bea70 (patch)
treed8e8c016d5bd43216402c04fbaa8e2dbf0e8dbe3 /smoketest/scripts/cli
parentddda0d66faa73900ed2b8fec1dde38ffc4a49fcd (diff)
downloadvyos-1x-b243795eba1b36cadd81c3149e833bdf5c5bea70.tar.gz
vyos-1x-b243795eba1b36cadd81c3149e833bdf5c5bea70.zip
vrrp: keepalived: T616: move configuration to volatile /run directory
Move keepalived configuration from /etc/keepalived to /run/keepalived.
Diffstat (limited to 'smoketest/scripts/cli')
-rwxr-xr-xsmoketest/scripts/cli/test_ha_vrrp.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py
index 03618c7d8..9c8d26699 100755
--- a/smoketest/scripts/cli/test_ha_vrrp.py
+++ b/smoketest/scripts/cli/test_ha_vrrp.py
@@ -14,22 +14,20 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-import re
import unittest
from base_vyostest_shim import VyOSUnitTestSHIM
from vyos.configsession import ConfigSession
from vyos.configsession import ConfigSessionError
+from vyos.ifconfig.vrrp import VRRP
from vyos.util import cmd
from vyos.util import process_named_running
from vyos.util import read_file
-
from vyos.template import inc_ip
PROCESS_NAME = 'keepalived'
-KEEPALIVED_CONF = '/etc/keepalived/keepalived.conf'
+KEEPALIVED_CONF = VRRP.location['config']
base_path = ['high-availability', 'vrrp']
vrrp_interface = 'eth1'