From 211dd7518f4303490ad7642f2bc1a018cda7ec49 Mon Sep 17 00:00:00 2001 From: Bartosz Cieślik Date: Sat, 16 Aug 2025 19:59:45 +0200 Subject: T7206: Fix vyos default config path --- cloudinit/config/cc_vyos.py | 2 +- cloudinit/config/cc_vyos_userdata.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 96324e4b..5894482f 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -1047,7 +1047,7 @@ def handle(name, cfg, cloud, log, _args): # VyOS configuration file selection cfg_file_name = '/opt/vyatta/etc/config/config.boot' - bak_file_name = '/opt/vyatta/etc/config.boot.default' + bak_file_name = '/usr/share/vyos/config.boot.default' # open configuration file if not Path(cfg_file_name).exists(): diff --git a/cloudinit/config/cc_vyos_userdata.py b/cloudinit/config/cc_vyos_userdata.py index 21deb3d6..b4367206 100644 --- a/cloudinit/config/cc_vyos_userdata.py +++ b/cloudinit/config/cc_vyos_userdata.py @@ -32,7 +32,7 @@ frequency = PER_INSTANCE TEMPLATES_DIR = '/opt/vyatta/share/vyatta-cfg/templates/' # VyOS configuration files CFG_FILE_MAIN = '/opt/vyatta/etc/config/config.boot' -CFG_FILE_DEFAULT = '/opt/vyatta/etc/config.boot.default' +CFG_FILE_DEFAULT = '/usr/share/vyos/config.boot.default' # get list of all tag nodes @@ -209,10 +209,10 @@ def handle(name, cfg, cloud, log, _args): # save a new configuration file try: - with open(config_file_path, 'w') as f: + with open(CFG_FILE_MAIN, 'w') as f: f.write(config.to_string()) logger.debug( - "Configuration file saved: {}".format(config_file_path)) + "Configuration file saved: {}".format(CFG_FILE_MAIN)) except Exception as err: logger.error("Failed to write config into the file {}: {}".format( - config_file_path, err)) + CFG_FILE_MAIN, err)) -- cgit v1.2.3