Merge ~andreserl/maas:2.2_lp1717287 into maas:2.2

[Andres Rodriguez]

Backport 21fb76a967c2d0196dc34b73d0ccab4e4dbd523b from master.

LP: #1717287 - maas-enlist not supporting IPv6 addresses in server_url

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bfefebd..86ba2b3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -30,6 +30,8 @@ LP: #1704444    [2.2] MAAS API returns 500 internal server error instead of rais
 
 LP: #1676992    Force Postgresql restart on maas-region-controller installation.
 
+LP: #1717287    maas-enlist not supporting IPv6 addresses in server_url.
+
 
 2.2.2
 =====
diff --git a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
index 27bff90..a579801 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
+++ b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
@@ -231,7 +231,7 @@ fi
 if echo "$serverurl" | egrep -q '(^[a-z]+://|^)[a-z0-9\.\-]+($|/$)'; then
 	api_url="MAAS/api/2.0/machines/"
 else
-	api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)[a-zA-Z0-9\.\-]\+\(\|\:[0-9]\+\)/##'`
+	api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)\([a-zA-Z0-9\.]\+\|\(\[[0-9a-fA-F:]\+\]\)\)\(\|\:[0-9]\+\)/##'`
 fi
 
 #TODO: Auto-detect hostname?