Merge "MAAS chart: configure extra MAAS settings"
This commit is contained in:
commit
329154c083
|
@ -190,6 +190,14 @@ function configure_boot_sources {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function configure_extra_settings {
|
||||||
|
{{- range $k, $v := .Values.conf.maas.extra_settings }}
|
||||||
|
check_then_set {{$k}} {{$v}}
|
||||||
|
{{- else }}
|
||||||
|
: No additional MAAS config
|
||||||
|
{{- end }}
|
||||||
|
}
|
||||||
|
|
||||||
function maas_login {
|
function maas_login {
|
||||||
KEY=$(maas-region apikey --username=${ADMIN_USERNAME})
|
KEY=$(maas-region apikey --username=${ADMIN_USERNAME})
|
||||||
if [ -z "$KEY" ]
|
if [ -z "$KEY" ]
|
||||||
|
@ -205,6 +213,7 @@ timer "$RETRY_TIMER" maas_login
|
||||||
configure_proxy
|
configure_proxy
|
||||||
configure_ntp
|
configure_ntp
|
||||||
configure_dns
|
configure_dns
|
||||||
|
configure_extra_settings
|
||||||
|
|
||||||
# make call to import images
|
# make call to import images
|
||||||
timer "$RETRY_TIMER" configure_boot_sources
|
timer "$RETRY_TIMER" configure_boot_sources
|
||||||
|
|
|
@ -235,6 +235,16 @@ conf:
|
||||||
secret:
|
secret:
|
||||||
namespace: maas
|
namespace: maas
|
||||||
name: maas-api-key
|
name: maas-api-key
|
||||||
|
extra_settings:
|
||||||
|
# Additional settings available via maas $PROFILE maas set-config
|
||||||
|
# Marks if the initial intro has been completed: true or false
|
||||||
|
completed_intro: true
|
||||||
|
# Enable Google Analytics: true or false
|
||||||
|
enable_analytics: false
|
||||||
|
# network_discovery: 'enabled' or 'disabled'
|
||||||
|
network_discovery: disabled
|
||||||
|
# active_discovery_interval (seconds): one of '0', '604800', '86400', '43200', '21600', '10800', '3600', '1800', '600'
|
||||||
|
active_discovery_interval: 0
|
||||||
# system user for console login/recovery in early phases of deployment
|
# system user for console login/recovery in early phases of deployment
|
||||||
system_user: 'root'
|
system_user: 'root'
|
||||||
system_passwd: 'password'
|
system_passwd: 'password'
|
||||||
|
|
Loading…
Reference in New Issue