From 06cf46de14100257cc6843c01ffc92216550b06d Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 25 Mar 2016 12:59:53 +0800 Subject: opencontrail: move vhost0 on eth1 JIRA: COMPASS-349 Change-Id: I2cdf8d10fbd2dbd3a015f0eb0eecc72f2266fb96 Signed-off-by: chenshuai@huawei.com --- .../roles/open-contrail/files/setup_networks_opencontrail.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/files') diff --git a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py b/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py index f8eb306a..fd7795af 100755 --- a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py +++ b/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py @@ -75,6 +75,15 @@ def setup_ips_new(config): LOG.info("setup_ips_new: cmd=%s" % cmd) os.system(cmd) +def setup_default_router(config): + LOG.info("setup_ips_new enter") + network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) + intf_name = config["provider_net_mappings"][0]["interface"] + cmd = "route del default;" + cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], "vhost0") + LOG.info("setup_default_router: cmd=%s" % cmd) + os.system(cmd) + def remove_ovs_kernel_mod(config): LOG.info("remove_ovs_kernel_mod enter") cmd = "rmmod vport_vxlan; rmmod openvswitch;" @@ -90,7 +99,8 @@ def main(config): setup_intfs(config["sys_intf_mappings"], uplink_map) setup_ips(config["ip_settings"], config["sys_intf_mappings"]) - setup_ips_new(config) +# setup_ips_new(config) + setup_default_router(config) if __name__ == "__main__": config = yaml.load(open(config_path)) -- cgit 1.2.3-korg