Merge ~andreserl/maas:lp1756127_2.3 into maas:2.3

[Andres Rodriguez]

Backport 3798b945473eb94410a937139a1a09a67f840572 from master

LP: #1756127 - Handle upper-case on api_url regex on enlistment preseed

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
index a579801..f3d7b2e 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
+++ b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
@@ -228,7 +228,7 @@ if [ -z "$servername" ]; then
 	serverurl="maas.local"
 	servername="$serverurl"
 fi
-if echo "$serverurl" | egrep -q '(^[a-z]+://|^)[a-z0-9\.\-]+($|/$)'; then
+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]\+\)/##'`