2d71c24e0f
- maas-enlist does not work with hyphenated domains. Backport from upstream fix. - Ignore MAC addresses of '00:00:00:00:00:00' to fix issue of OVS break MAAS controller registration Change-Id: I26b09bb35ef3bfc9424188dbf9fccf0ca3199441
14 lines
748 B
Diff
14 lines
748 B
Diff
diff --git a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
|
|
index cb9515c..394b0bd 100644
|
|
--- a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
|
|
+++ b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
|
|
@@ -236,7 +236,7 @@ fi
|
|
if echo "$serverurl" | egrep -q '(^[a-z]+://|^)[a-zA-Z0-9\.\-]+($|/$)'; then
|
|
api_url="MAAS/api/2.0/machines/"
|
|
else
|
|
- api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)\([a-zA-Z0-9\.]\+\|\(\[[0-9a-fA-F:]\+\]\)\)\(\|\:[0-9]\+\)/##'`
|
|
+ api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)\([a-zA-Z0-9\.\-]\+\|\(\[[0-9a-fA-F:]\+\]\)\)\(\|\:[0-9]\+\)/##'`
|
|
fi
|
|
|
|
if [ -z "$hostname" ] && [ "$quite" != "true" ]; then
|