openstack/kolla-ansible
Code Issues Proposed changes

fix shell error about tools/init-vpn

Browse Source 
Change-Id: Ie865b7175b46f939b629d5378d98d0aeba963df2
Closes-Bug: #1729778
This commit is contained in:
rtmdk 2017-11-03 14:33:36 +08:00
parent 214866350a
commit 0c6879b85f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/init-vpn
View File

@ -19,8 +19,7 @@ function setup_site(){
function get_external_ip(){ function get_external_ip(){
local router_id=`neutron router-show $1 | awk '/ id /{print $4}'` local router_id=`neutron router-show $1 | awk '/ id /{print $4}'`
echo `neutron port-list -c fixed_ips -c device_id -c device_owner|grep router_gateway | awk echo `neutron router-list | grep '$router_id' | awk -F '"' '{print $16}'`
'/'.$router_id.'/{print $5}' | sed 's/["}]//g'`
} }
function clean_site(){ function clean_site(){
@ -42,11 +41,11 @@ function setup(){
WEST_IP=$(get_external_ip router_west) WEST_IP=$(get_external_ip router_west)
setup_site east $EAST_SUBNET setup_site east $EAST_SUBNET
EAST_IP=$(get_external_ip router_east) EAST_IP=$(get_external_ip router_east)
neutron ipsec-site-connection-create --name conn_east --vpnservice-id vpn_east --ikepolicy-id neutron ipsec-site-connection-create --name conn_east --vpnservice-id vpn_east --ikepolicy-id \
ikepolicy1 --ipsecpolicy-id ipsecpolicy1 --peer-address $WEST_IP --peer-id $WEST_IP --peer-cidr ikepolicy1 --ipsecpolicy-id ipsecpolicy1 --peer-address $WEST_IP --peer-id $WEST_IP --peer-cidr \
$WEST_SUBNET --psk secret $WEST_SUBNET --psk secret
neutron ipsec-site-connection-create --name conn_west --vpnservice-id vpn_west --ikepolicy-id neutron ipsec-site-connection-create --name conn_west --vpnservice-id vpn_west --ikepolicy-id \
ikepolicy1 --ipsecpolicy-id ipsecpolicy1 --peer-address $EAST_IP --peer-id $EAST_IP --peer-cidr ikepolicy1 --ipsecpolicy-id ipsecpolicy1 --peer-address $EAST_IP --peer-id $EAST_IP --peer-cidr \
$EAST_SUBNET --psk secret $EAST_SUBNET --psk secret
} }