Merge "Support YAML sequence for DNS and NTP servers"
This commit is contained in:
commit
9b527b4b99
|
@ -68,13 +68,13 @@ spec:
|
||||||
- name: MAAS_HTTP_BOOT
|
- name: MAAS_HTTP_BOOT
|
||||||
value: {{ .Values.conf.maas.http_boot | quote }}
|
value: {{ .Values.conf.maas.http_boot | quote }}
|
||||||
- name: MAAS_NTP_SERVERS
|
- 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
|
- name: MAAS_NTP_EXTERNAL_ONLY
|
||||||
value: {{ .Values.conf.maas.ntp.use_external_only | quote }}
|
value: {{ .Values.conf.maas.ntp.use_external_only | quote }}
|
||||||
- name: MAAS_DNS_DNSSEC_REQUIRED
|
- name: MAAS_DNS_DNSSEC_REQUIRED
|
||||||
value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
|
value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
|
||||||
- name: MAAS_DNS_SERVERS
|
- name: MAAS_DNS_SERVERS
|
||||||
value: {{ .Values.conf.maas.dns.dns_servers }}
|
value: {{ .Values.conf.maas.dns.dns_servers | join "," | quote }}
|
||||||
- name: MAAS_DEFAULT_OS
|
- name: MAAS_DEFAULT_OS
|
||||||
value: {{ .Values.conf.maas.images.default_os | quote }}
|
value: {{ .Values.conf.maas.images.default_os | quote }}
|
||||||
- name: MAAS_DEFAULT_DISTRO
|
- name: MAAS_DEFAULT_DISTRO
|
||||||
|
|
|
@ -163,11 +163,11 @@ conf:
|
||||||
# Use external only points region and rack serves and deployed nodes directly
|
# Use external only points region and rack serves and deployed nodes directly
|
||||||
# at external NTP servers. Otherwise we have nodes -> rack -> region -> external
|
# at external NTP servers. Otherwise we have nodes -> rack -> region -> external
|
||||||
use_external_only: false
|
use_external_only: false
|
||||||
ntp_servers: null
|
ntp_servers: []
|
||||||
dns:
|
dns:
|
||||||
require_dnssec: no
|
require_dnssec: no
|
||||||
# These are upstream servers
|
# These are upstream servers
|
||||||
dns_servers: null
|
dns_servers: []
|
||||||
proxy:
|
proxy:
|
||||||
# Whether deploying nodes should use MaaS region as an APT proxy
|
# Whether deploying nodes should use MaaS region as an APT proxy
|
||||||
proxy_enabled: false
|
proxy_enabled: false
|
||||||
|
|
Loading…
Reference in New Issue