Merge "Support YAML sequence for DNS and NTP servers"

This commit is contained in:
Zuul 2018-11-21 15:35:59 +00:00 committed by Gerrit Code Review
commit 9b527b4b99
2 changed files with 4 additions and 4 deletions

View File

@ -68,13 +68,13 @@ spec:
- name: MAAS_HTTP_BOOT
value: {{ .Values.conf.maas.http_boot | quote }}
- name: MAAS_NTP_SERVERS
value: {{ .Values.conf.maas.ntp.ntp_servers }}
value: {{ .Values.conf.maas.ntp.ntp_servers | join "," | quote }}
- name: MAAS_NTP_EXTERNAL_ONLY
value: {{ .Values.conf.maas.ntp.use_external_only | quote }}
- name: MAAS_DNS_DNSSEC_REQUIRED
value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
- name: MAAS_DNS_SERVERS
value: {{ .Values.conf.maas.dns.dns_servers }}
value: {{ .Values.conf.maas.dns.dns_servers | join "," | quote }}
- name: MAAS_DEFAULT_OS
value: {{ .Values.conf.maas.images.default_os | quote }}
- name: MAAS_DEFAULT_DISTRO

View File

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