MAAS

Merge ~andreserl/maas:lp1777924_maas_enlist_regex into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. lp1777924_maas_enlist_regex
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 03fa96fbc2cd5535e51f7594a3effebba239bc30
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1777924_maas_enlist_regex
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/metadataserver/user_data/templates/snippets/maas_enlist.sh (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Andres Rodriguez (community) Approve
Blake Rouse (community) Approve
Review via email: mp+348312@code.launchpad.net

Commit message

LP: #1777924 - Match regex on domains that include a '-'.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) :
review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1777924_maas_enlist_regex lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 03fa96fbc2cd5535e51f7594a3effebba239bc30

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
2index cb9515c..394b0bd 100644
3--- a/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
4+++ b/src/metadataserver/user_data/templates/snippets/maas_enlist.sh
5@@ -236,7 +236,7 @@ fi
6 if echo "$serverurl" | egrep -q '(^[a-z]+://|^)[a-zA-Z0-9\.\-]+($|/$)'; then
7 api_url="MAAS/api/2.0/machines/"
8 else
9- api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)\([a-zA-Z0-9\.]\+\|\(\[[0-9a-fA-F:]\+\]\)\)\(\|\:[0-9]\+\)/##'`
10+ api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)\([a-zA-Z0-9\.\-]\+\|\(\[[0-9a-fA-F:]\+\]\)\)\(\|\:[0-9]\+\)/##'`
11 fi
12
13 if [ -z "$hostname" ] && [ "$quite" != "true" ]; then

Subscribers

People subscribed via source and target branches