From 5cb7936b409e36200600cf29e85ffefd86960cf5 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Tue, 9 Jan 2018 14:06:17 -0600 Subject: [PATCH] Support HTTP boot MaaS 2.3 now supports serving ephemeral images via HTTP instead of iSCSI Change-Id: I6c8d4d2c89cfc40f5352edc04bffa5b27ec785df --- charts/maas/templates/bin/_import-boot-resources.sh.tpl | 1 + charts/maas/templates/job-import.yaml | 2 ++ charts/maas/values.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/charts/maas/templates/bin/_import-boot-resources.sh.tpl b/charts/maas/templates/bin/_import-boot-resources.sh.tpl index 825ad8a..84a7d32 100644 --- a/charts/maas/templates/bin/_import-boot-resources.sh.tpl +++ b/charts/maas/templates/bin/_import-boot-resources.sh.tpl @@ -55,6 +55,7 @@ function configure_boot_sources { then maas ${ADMIN_USERNAME} boot-source update 1 url=http://localhost:8888/maas/images/ephemeral-v3/daily/ fi + maas ${ADMIN_USERNAME} maas set-config name=http_boot value=${MAAS_HTTP_BOOT} } KEY=$(maas-region apikey --username=${ADMIN_USERNAME}) diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml index d6f630b..8ea093c 100644 --- a/charts/maas/templates/job-import.yaml +++ b/charts/maas/templates/job-import.yaml @@ -56,6 +56,8 @@ spec: value: {{ .Values.conf.maas.proxy.peer_proxy_enabled | quote }} - name: MAAS_PROXY_SERVER value: {{ .Values.conf.maas.proxy.proxy_server }} + - name: MAAS_HTTP_BOOT + value: {{ .Values.conf.maas.http_boot | quote }} - name: MAAS_NTP_SERVERS value: {{ .Values.conf.maas.ntp.ntp_servers }} - name: MAAS_NTP_EXTERNAL_ONLY diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml index 9f3f68e..d4d50b0 100644 --- a/charts/maas/values.yaml +++ b/charts/maas/values.yaml @@ -123,6 +123,7 @@ conf: maas: override: append: + http_boot: true url: maas_url: null ntp: