1 files changed, 8 insertions, 2 deletions
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 9911f654..af349e5c 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -19,10 +19,16 @@ autoinstall:
 {% else %}
         addresses:
         - {{ network.primary.address }}
-        gateway4: {{ network.primary.gateway }}
+{%   if 'gateway' in network %}
+        routes:
+        - to: default
+          via: {{ network.primary.gateway }}
+{%   endif %}
 {%   if (network.nameservers  | default([]) | length) > 0 %}
         nameservers:
-          search: [ {{ host_domain }} ]
+{%     if 'domain' in network %}
+          search: [ {{ network.domain }} ]
+{%     endif %}
           addresses: [ {{ network.nameservers | join(', ') }} ]
 {%   endif %}
 {% endif %}