generators/cloud-init: Fix network-config

This fixes a bug where cloud-init.network-config wouldn't be used if it was set. Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>
lxc · Jan 5, 2022 · 72f7e89 · 72f7e89
1 parent 2a631aa
commit 72f7e89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/generators/cloud-init.go b/generators/cloud-init.go
@@ -143,13 +143,7 @@ config:
 {{- config_get("user.network-config", "") -}}
 {%- endif -%}
 {%- else -%}
-version: 1
-config:
-  - type: physical
-    name: {% if instance.type == "virtual-machine" %}enp5s0{% else %}eth0{% endif %}
-    subnets:
-      - type: dhcp
-        control: auto
+{{- config_get("cloud-init.network-config", "") -}}
 {%- endif %}
 `
 	default:

diff --git a/generators/cloud-init_test.go b/generators/cloud-init_test.go
@@ -139,13 +139,7 @@ config:
 {{- config_get("user.network-config", "") -}}
 {%- endif -%}
 {%- else -%}
-version: 1
-config:
-  - type: physical
-    name: {% if instance.type == "virtual-machine" %}enp5s0{% else %}eth0{% endif %}
-    subnets:
-      - type: dhcp
-        control: auto
+{{- config_get("cloud-init.network-config", "") -}}
 {%- endif %}
 `,
 			false,