airship/maas
Code Issues Proposed changes

Merge "maas-region: option to always use GPT"

Browse Source
This commit is contained in:
Zuul 2020-06-02 20:35:30 +00:00 committed by Gerrit Code Review
commit 2989bbb4a2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
charts/maas/templates/bin/_start.sh.tpl
View File

@ -52,5 +52,10 @@ done
if [[ $sh_set = false ]]; then
exit 1
fi
{{- if .Values.conf.maas.force_gpt }}
# Forcing the use of GPT irrespective of boot disk size
# https://github.com/maas/maas/blob/2.3/src/maasserver/models/partitiontable.py#L51-L53
sed -i '/^GPT_REQUIRED_SIZE =/c\GPT_REQUIRED_SIZE = 0' /usr/lib/python3/dist-packages/maasserver/models/partitiontable.py
{{- end }}
set -e
exec /sbin/init --log-target=console 3>&1

6
charts/maas/values.yaml
View File

@ -235,6 +235,12 @@ conf:
secret:
namespace: maas
name: maas-api-key
# By default, MAAS will use MBR for boot disks smaller than 2 TiB.
# Set force_gpt: true to always use GPT.
# NOTE: This is not a standard MAAS setting, and enabling it will cause
# modification of a file during maas-region pod startup:
# /usr/lib/python3/dist-packages/maasserver/models/partitiontable.py
force_gpt: false
extra_settings:
# Additional settings available via maas $PROFILE maas set-config
# Marks if the initial intro has been completed: true or false