diff --git a/charts/maas/Chart.yaml b/charts/maas/Chart.yaml index 99ab411..675f682 100755 --- a/charts/maas/Chart.yaml +++ b/charts/maas/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 description: Chart to run Canonical MaaS name: maas -version: 0.1.3 +version: 0.1.4 home: https://docs.ubuntu.com/maas sources: - https://git.launchpad.net/maas diff --git a/charts/maas/templates/bin/_import-boot-resources.sh.tpl b/charts/maas/templates/bin/_import-boot-resources.sh.tpl index a00797a..9aff060 100644 --- a/charts/maas/templates/bin/_import-boot-resources.sh.tpl +++ b/charts/maas/templates/bin/_import-boot-resources.sh.tpl @@ -192,6 +192,28 @@ function configure_boot_sources { fi } +function create_extra_commissioning_script { + cat > /tmp/script.sh << 'EOF' +#!/bin/bash +set -e + +output="" +for net_iface in /sys/class/net/ens* +do + if [ -z "$output" ]; then output="{"; else output+=","; fi + output+=" \"$(basename "$net_iface")\": \"$(udevadm test-builtin net_id "$net_iface" 2>/dev/null | grep ID_NET_NAME_PATH | awk -F '=' '{print $2}')\"" +done +if [ -z "$output" ]; then output="{}"; else output+=" }"; fi + +echo $output + +EOF + + maas "${ADMIN_USERNAME}" commissioning-scripts create name='99-netiface-names.sh' content@=/tmp/script.sh + + rm /tmp/script.sh +} + function configure_extra_settings { {{- range $k, $v := .Values.conf.maas.extra_settings }} check_then_set {{$k}} {{$v}} @@ -217,6 +239,7 @@ configure_ntp configure_dns configure_syslog configure_extra_settings +create_extra_commissioning_script # make call to import images timer "$RETRY_TIMER" configure_boot_sources @@ -228,4 +251,4 @@ then else echo "Image import FAILED!" exit 1 -fi +fi \ No newline at end of file