|
@@ -747,10 +747,10 @@ setup_mesh() {
|
|
fi
|
|
fi
|
|
|
|
|
|
echo "Obtaining a netmaker enrollment key..."
|
|
echo "Obtaining a netmaker enrollment key..."
|
|
- local netmakerTag=$(nmctl enrollment_key list | jq '.[] | .tags[0]' | tr -d '"')
|
|
|
|
|
|
+ local netmakerTag=$(nmctl enrollment_key list | jq -r '.[] | .tags[0]')
|
|
if [ ${netmakerTag} = "netmaker" ]; then
|
|
if [ ${netmakerTag} = "netmaker" ]; then
|
|
# key exists already, fetch token
|
|
# key exists already, fetch token
|
|
- TOKEN=$(nmctl enrollment_key list | jq '.[] | select(.tags[0]=="netmaker") | .token' | tr -d '"')
|
|
|
|
|
|
+ TOKEN=$(nmctl enrollment_key list | jq -r '.[] | select(.tags[0]=="netmaker") | .token')
|
|
else
|
|
else
|
|
local tokenJson=$(nmctl enrollment_key create --tags netmaker --unlimited --networks netmaker)
|
|
local tokenJson=$(nmctl enrollment_key create --tags netmaker --unlimited --networks netmaker)
|
|
TOKEN=$(jq -r '.token' <<<${tokenJson})
|
|
TOKEN=$(jq -r '.token' <<<${tokenJson})
|