Merge pull request #62 from zdc/T5012-equuleus

network: T5012: Added a new option for network-config control

1 files changed, 10 insertions, 2 deletions

diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py
index dd95a245..0d445506 100644
--- a/cloudinit/config/cc_vyos.py
+++ b/cloudinit/config/cc_vyos.py
@@ -31,7 +31,7 @@ from cloudinit.distros import ug_util
 from cloudinit.settings import PER_INSTANCE
 from cloudinit.sources import INSTANCE_JSON_FILE
 from cloudinit.stages import Init
-from cloudinit.util import load_file, load_json, get_hostname_fqdn
+from cloudinit.util import load_file, load_json, get_hostname_fqdn, get_cfg_by_path
 from cloudinit.sources.DataSourceOVF import get_properties as ovf_get_properties
 try:
     from vyos.configtree import ConfigTree
@@ -594,8 +594,16 @@ def handle(name, cfg, cloud, log, _args):
             hostname = None
         network_configured = True
 
+    # get network-config control options
+    network_config_global: str = get_cfg_by_path(cfg, 'network/config', '')
+    network_config_vyos: str = get_cfg_by_path(
+        cfg, 'vyos_config_options/network_config', network_config_global)
+    if network_config_vyos == 'disabled':
+        logger.debug("Network-config is disabled (global/vyos): {}/{}".format(
+            network_config_global, network_config_vyos))
+
     # process networking configuration data
-    if netcfg and network_configured is False:
+    if netcfg and network_configured is False and network_config_vyos != 'disabled':
         # check which one version of config we have
         # version 1
         if netcfg['version'] == 1: