Browse Source

Merge "Support YAML sequence for DNS and NTP servers"

Zuul 5 months ago
parent
commit
9b527b4b99
2 changed files with 4 additions and 4 deletions
  1. 2
    2
      charts/maas/templates/job-import.yaml
  2. 2
    2
      charts/maas/values.yaml

+ 2
- 2
charts/maas/templates/job-import.yaml View File

@@ -68,13 +68,13 @@ spec:
68 68
             - name: MAAS_HTTP_BOOT
69 69
               value: {{ .Values.conf.maas.http_boot | quote }}
70 70
             - name: MAAS_NTP_SERVERS
71
-              value: {{ .Values.conf.maas.ntp.ntp_servers }}
71
+              value: {{ .Values.conf.maas.ntp.ntp_servers | join "," | quote }}
72 72
             - name: MAAS_NTP_EXTERNAL_ONLY
73 73
               value: {{ .Values.conf.maas.ntp.use_external_only | quote }}
74 74
             - name: MAAS_DNS_DNSSEC_REQUIRED
75 75
               value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
76 76
             - name: MAAS_DNS_SERVERS
77
-              value: {{ .Values.conf.maas.dns.dns_servers }}
77
+              value: {{ .Values.conf.maas.dns.dns_servers | join "," | quote }}
78 78
             - name: MAAS_DEFAULT_OS
79 79
               value: {{ .Values.conf.maas.images.default_os | quote }}
80 80
             - name: MAAS_DEFAULT_DISTRO

+ 2
- 2
charts/maas/values.yaml View File

@@ -163,11 +163,11 @@ conf:
163 163
       # Use external only points region and rack serves and deployed nodes directly
164 164
       # at external NTP servers. Otherwise we have nodes -> rack -> region -> external
165 165
       use_external_only: false
166
-      ntp_servers: null
166
+      ntp_servers: []
167 167
     dns:
168 168
       require_dnssec: no
169 169
       # These are upstream servers
170
-      dns_servers: null
170
+      dns_servers: []
171 171
     proxy:
172 172
       # Whether deploying nodes should use MaaS region as an APT proxy
173 173
       proxy_enabled: false

Loading…
Cancel
Save