summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-05-01 18:43:47 +0200
committerChristian Poessinger <christian@poessinger.com>2022-05-01 18:43:47 +0200
commite6af32344b1647f59543cbc659704bb9ef08be5f (patch)
treec5229483f98adf556c95cadffc67e306e65212f0
parent827cefbcbfa22b42c8f144a41d6a2d3825268755 (diff)
downloadvyos-1x-e6af32344b1647f59543cbc659704bb9ef08be5f.tar.gz
vyos-1x-e6af32344b1647f59543cbc659704bb9ef08be5f.zip
container: T4353: fix Jinja2 linting errors
-rw-r--r--data/templates/container/registries.conf.j2 (renamed from data/templates/containers/registries.conf.j2)0
-rw-r--r--data/templates/container/storage.conf.j2 (renamed from data/templates/containers/storage.conf.j2)0
-rw-r--r--interface-definitions/container.xml.in (renamed from interface-definitions/containers.xml.in)0
-rwxr-xr-xsrc/conf_mode/container.py (renamed from src/conf_mode/containers.py)4
4 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/containers/registries.conf.j2 b/data/templates/container/registries.conf.j2
index 4057bb452..4057bb452 100644
--- a/data/templates/containers/registries.conf.j2
+++ b/data/templates/container/registries.conf.j2
diff --git a/data/templates/containers/storage.conf.j2 b/data/templates/container/storage.conf.j2
index 3a69b7252..3a69b7252 100644
--- a/data/templates/containers/storage.conf.j2
+++ b/data/templates/container/storage.conf.j2
diff --git a/interface-definitions/containers.xml.in b/interface-definitions/container.xml.in
index 85231b50c..85231b50c 100644
--- a/interface-definitions/containers.xml.in
+++ b/interface-definitions/container.xml.in
diff --git a/src/conf_mode/containers.py b/src/conf_mode/container.py
index 1cc6f5a35..7e1dc5911 100755
--- a/src/conf_mode/containers.py
+++ b/src/conf_mode/container.py
@@ -254,8 +254,8 @@ def generate(container):
write_file(f'/etc/cni/net.d/{network}.conflist', json_write(tmp, indent=2))
- render(config_containers_registry, 'containers/registries.conf.j2', container)
- render(config_containers_storage, 'containers/storage.conf.j2', container)
+ render(config_containers_registry, 'container/registries.conf.j2', container)
+ render(config_containers_storage, 'container/storage.conf.j2', container)
return None