diff options
author | Harry Huang <huangxiangyu5@huawei.com> | 2017-07-25 17:01:04 +0800 |
---|---|---|
committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-08-11 15:06:29 +0800 |
commit | 02708db0054bcabf4db151d4b364d70ecc44ef18 (patch) | |
tree | 927dca85b79e918ce30d1f96f6c8bd09079777fa /deploy/launch.sh | |
parent | 58f021096b8c7969bcbbc9e06934f0718b71a2b9 (diff) |
Adapt network.yml to OpenStack Ansible
JIRA:COMPASS-557
1. modify sys_intf_mappings and ip_settings in
network.yml to synchronize with OSA network.
networks compass build will be mgmt, external,
tenant, storage.
2. modify compass_conf to support new netwok.yml
3. fix some hard coding when transfer ip parameters
4. support heterogeneous network
Change-Id: Ib4a8af1f96a40e6456242e3dc2b456e0c8c17c2e
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/launch.sh')
-rwxr-xr-x | deploy/launch.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index 8bba3403..6cbad1fa 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -104,15 +104,6 @@ if [[ "$DEPLOY_HOST" == "true" || $REDEPLOY_HOST == "true" ]]; then echo $HOST_ROLES echo $TYPE echo $DHA - if [[ `echo $HOST_ROLES | grep opencontrail` ]]; then - ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - vgw_ip=$(sshpass -p 'root' ssh $ssh_options root@$MGMT_IP 'cat /home/opencontrail1.rc') - externet_cidr=$(sshpass -p 'root' ssh $ssh_options root@$MGMT_IP 'cat /home/opencontrail2.rc') - sudo ip route add $externet_cidr via $vgw_ip dev br-external 2>/dev/null - sleep 60 - sudo python ${COMPASS_DIR}/deploy/reset_compute.py $TYPE $DHA - sleep 600 - fi fi public_vip=$(get_public_vip) |