Fix install netmask 45/40645/1
authorHarry Huang <huangxiangyu5@huawei.com>
Wed, 30 Aug 2017 01:19:13 +0000 (09:19 +0800)
committerHarry Huang <huangxiangyu5@huawei.com>
Wed, 30 Aug 2017 01:31:49 +0000 (09:31 +0800)
Netmask of install network is parsed from
netwok.yml now. A var named INSTALL_NETWORK
will be generated in script/deploy_config.sh
and exported. But var of install mask in
deploy/network.sh is called INSTALL_MASK.
This mismatch cause empty netmask of install
network.

Change-Id: I2a468844a74a9c38481615d6353149fa74ccbcd9
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
deploy/network.sh

index e50f52a..218dc1d 100755 (executable)
@@ -124,7 +124,7 @@ function recover_nat_net() {
 }
 
 function setup_virtual_net() {
-  setup_nat_net install $INSTALL_GW $INSTALL_MASK
+  setup_nat_net install $INSTALL_GW $INSTALL_NETMASK
   setup_nat_net external_nat $EXT_NAT_GW $EXT_NAT_MASK $EXT_NAT_IP_START $EXT_NAT_IP_END
 }
 
@@ -170,7 +170,7 @@ function create_nets() {
     setup_"$TYPE"_net
 
     # create external network
-#    setup_bridge_external
+    # setup_bridge_external
     clear_forward_rejct_rules
 
     setup_network_boot_scripts