summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-21 15:35:59 +0000
committerGerrit Code Review <review@openstack.org>2018-11-21 15:35:59 +0000
commit9b527b4b99ac773a1b3c7ed39d43fa2d18534efb (patch)
tree14762eead402500b00fa900430c726e6e8e089e1
parentb4d6562bbabdc87a7a29af9841fcf77c8ce6ab90 (diff)
parent56cc46f9f0438cd0f956b83294a2be5ae110258f (diff)
Merge "Support YAML sequence for DNS and NTP servers"
-rw-r--r--charts/maas/templates/job-import.yaml4
-rw-r--r--charts/maas/values.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index 8077338..4b04548 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -68,13 +68,13 @@ spec:
68 - name: MAAS_HTTP_BOOT 68 - name: MAAS_HTTP_BOOT
69 value: {{ .Values.conf.maas.http_boot | quote }} 69 value: {{ .Values.conf.maas.http_boot | quote }}
70 - name: MAAS_NTP_SERVERS 70 - name: MAAS_NTP_SERVERS
71 value: {{ .Values.conf.maas.ntp.ntp_servers }} 71 value: {{ .Values.conf.maas.ntp.ntp_servers | join "," | quote }}
72 - name: MAAS_NTP_EXTERNAL_ONLY 72 - name: MAAS_NTP_EXTERNAL_ONLY
73 value: {{ .Values.conf.maas.ntp.use_external_only | quote }} 73 value: {{ .Values.conf.maas.ntp.use_external_only | quote }}
74 - name: MAAS_DNS_DNSSEC_REQUIRED 74 - name: MAAS_DNS_DNSSEC_REQUIRED
75 value: {{ .Values.conf.maas.dns.require_dnssec | quote }} 75 value: {{ .Values.conf.maas.dns.require_dnssec | quote }}
76 - name: MAAS_DNS_SERVERS 76 - name: MAAS_DNS_SERVERS
77 value: {{ .Values.conf.maas.dns.dns_servers }} 77 value: {{ .Values.conf.maas.dns.dns_servers | join "," | quote }}
78 - name: MAAS_DEFAULT_OS 78 - name: MAAS_DEFAULT_OS
79 value: {{ .Values.conf.maas.images.default_os | quote }} 79 value: {{ .Values.conf.maas.images.default_os | quote }}
80 - name: MAAS_DEFAULT_DISTRO 80 - name: MAAS_DEFAULT_DISTRO
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index bfcaf2c..f9a2c01 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -163,11 +163,11 @@ conf:
163 # Use external only points region and rack serves and deployed nodes directly 163 # Use external only points region and rack serves and deployed nodes directly
164 # at external NTP servers. Otherwise we have nodes -> rack -> region -> external 164 # at external NTP servers. Otherwise we have nodes -> rack -> region -> external
165 use_external_only: false 165 use_external_only: false
166 ntp_servers: null 166 ntp_servers: []
167 dns: 167 dns:
168 require_dnssec: no 168 require_dnssec: no
169 # These are upstream servers 169 # These are upstream servers
170 dns_servers: null 170 dns_servers: []
171 proxy: 171 proxy:
172 # Whether deploying nodes should use MaaS region as an APT proxy 172 # Whether deploying nodes should use MaaS region as an APT proxy
173 proxy_enabled: false 173 proxy_enabled: false