From 47e9c11c8edf174168dea800d2eb9415c6bb6048 Mon Sep 17 00:00:00 2001
From: Olaf Bohlen <olaf.bohlen@niit.com>
Date: Thu, 20 Aug 2020 15:33:45 +0200
Subject: [PATCH] cleaned up template
---
templates/sysding.j2 | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/templates/sysding.j2 b/templates/sysding.j2
index 9d3e62c..c3afcc7 100644
--- a/templates/sysding.j2
+++ b/templates/sysding.j2
@@ -1,5 +1,6 @@
-setup_timezone "{{ oizone['sysding']['timezone'] }}"
-setup_locale "{{ oizone['sysding']['locale'] }}"
+setup_timezone {{ oizone['sysding']['timezone'] }}
+setup_locale {{ oizone['sysding']['locale'] }}
+
{% if oizone['sysding']['nfs4domain'] %}
setup_nfs4domain "{{ oizone['sysding']['nfs4domain'] }}"
{% endif %}
@@ -12,6 +13,7 @@
{% endif %}
setup_user_password {{ user['name'] }} '{{ user["hashedpassword"] }}'
{% endfor %}
+
{% if oizone['iptype'] == "exclusive-ip" %}
{% for nic in oizone['nics'] %}
setup_interface {{ nic['logical'] }} {{ nic['addrsuffix'] }} {{ nic['address'] }}
@@ -22,6 +24,6 @@
setup_route {{ route['target'] }} {{ route['router'] }}
{% endfor %}
-{% if oizone['sysding']['dns'] %}
-setup_ns_dns "{{ oizone['sysding']['dns']['domain'] }}" "{{ oizone['sysding']['dns']['search'] | join(' ') }}" "{{ oizone['sysding']['dns']['nameservers'] | join(' ') }}"
+{% if oizone['sysding']['ip']['dns'] %}
+setup_ns_dns "{{ oizone['sysding']['ip']['dns']['domain'] }}" "{{ oizone['sysding']['ip']['dns']['search'] | join(' ') }}" "{{ oizone['sysding']['ip']['dns']['nameservers'] | join(' ') }}"
{% endif %}
--
Gitblit v1.9.3