diff options
author | varac <varac@leap.se> | 2016-07-22 08:16:43 +0000 |
---|---|---|
committer | varac <varac@leap.se> | 2016-07-22 08:16:43 +0000 |
commit | f32ca60553114813aecec1b1bd2d7827de05d86f (patch) | |
tree | 39d251d696c31cd25d27063b657479c6284e1167 | |
parent | 80faa0016d00654e31d4c5daadf1b0e96821f72e (diff) |
Fix openvpn gateway ip
-rwxr-xr-x | leap-platform-test | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/leap-platform-test b/leap-platform-test index 6f00ef4..eb97eb8 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -42,25 +42,24 @@ EOF } add_nodes() { - suffix=$IP_SUFFIX_START - for i in "$@" - do - node=${i%:*} - services=${i#*:} - let suffix++ - ip="${IP_PREFIX}.$suffix" - case $services in - openvpn) - config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99" - ;; - *) - config= - ;; - esac - - rm "nodes/${node}.json" - $LEAP_CMD node add --local "$node" ip_address:"$ip" $config services:"$services" tags:"$TAG" - done + suffix=$IP_SUFFIX_START + for i in "$@" + do + node=${i%:*} + services=${i#*:} + let suffix++ + ip="${IP_PREFIX}.$suffix" + + if [[ "$services" =~ "openvpn" ]] + then + config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99" + else + config='' + fi + + rm "nodes/${node}.json" + $LEAP_CMD node add --local "$node" ip_address:"$ip" $config services:"$services" tags:"$TAG" + done } destroy_vms() { |