diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-12-30 13:11:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-30 13:11:35 +0000 |
| commit | 348e26aa40c8a0fbc921fc2153715e48fcd28f71 (patch) | |
| tree | ae3367bdcbb3f4cec9d3c01486ad69ba2d0b9bc7 /src | |
| parent | 017bd072b6ab2b897495f7312e27a9b95dd194b4 (diff) | |
| parent | f2ce2d66537e83b9859d70fea043f82089222104 (diff) | |
| download | vyos-1x-348e26aa40c8a0fbc921fc2153715e48fcd28f71.tar.gz vyos-1x-348e26aa40c8a0fbc921fc2153715e48fcd28f71.zip | |
Merge pull request #4918 from c-po/no-pki-default-node
config: T8124: make get_config_dict() pki={} node purely optional
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf_mode/load-balancing_haproxy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/load-balancing_haproxy.py b/src/conf_mode/load-balancing_haproxy.py index 4c26ed0b4..b5509f526 100644 --- a/src/conf_mode/load-balancing_haproxy.py +++ b/src/conf_mode/load-balancing_haproxy.py @@ -127,7 +127,7 @@ def verify(lb): def generate(lb): if not lb: - # Delete /run/haproxy/haproxy.cfg + # Delete generated config files config_files = [load_balancing_conf_file, systemd_override] for file in config_files: if os.path.isfile(file): @@ -142,8 +142,8 @@ def generate(lb): if not os.path.isdir(load_balancing_dir): os.mkdir(load_balancing_dir) - loaded_ca_certs = {load_certificate(c['certificate']) - for c in lb['pki']['ca'].values()} if 'ca' in lb['pki'] else {} + loaded_ca_certs = {load_certificate(cert_data['certificate']) + for _, cert_data in dict_search('pki.ca', lb, default={}).items()} # SSL Certificates for frontend for front, front_config in lb['service'].items(): |