summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2018-10-22 14:35:55 -0500
committerScott Hussey <sh8121@att.com>2018-10-22 14:35:55 -0500
commit56cc46f9f0438cd0f956b83294a2be5ae110258f (patch)
tree63bc2096820f90e2cb56184f6d3a64ae7ad9c964
parentd1d5b88d3db637a3fa6671a0cd04f9c817a749da (diff)
Support YAML sequence for DNS and NTP servers
- When specifying the list of upstream DNS or NTP servers to configure MAAS with, use YAML sequences rather than forcing a string Change-Id: If0da29c0ad2c7299250ecba120bca54920e54052
Notes
Notes (review): Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Pete Birley <petebirley@gmail.com> Workflow+1: Pete Birley <petebirley@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 21 Nov 2018 15:35:59 +0000 Reviewed-on: https://review.openstack.org/612484 Project: openstack/airship-maas Branch: refs/heads/master
-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 0a05558..cf76894 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 f2cd3b0..833b729 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -157,11 +157,11 @@ conf:
157 # Use external only points region and rack serves and deployed nodes directly 157 # Use external only points region and rack serves and deployed nodes directly
158 # at external NTP servers. Otherwise we have nodes -> rack -> region -> external 158 # at external NTP servers. Otherwise we have nodes -> rack -> region -> external
159 use_external_only: false 159 use_external_only: false
160 ntp_servers: null 160 ntp_servers: []
161 dns: 161 dns:
162 require_dnssec: no 162 require_dnssec: no
163 # These are upstream servers 163 # These are upstream servers
164 dns_servers: null 164 dns_servers: []
165 proxy: 165 proxy:
166 # Whether deploying nodes should use MaaS region as an APT proxy 166 # Whether deploying nodes should use MaaS region as an APT proxy
167 proxy_enabled: false 167 proxy_enabled: false