summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-01-06 08:19:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-06 08:19:46 +0000
commit946eb1fca19b9d25ec4d55f639b07cbd233f4fe0 (patch)
tree80f895c49fb4e788d5553ab9de160881ff7a270e
parent9406f0f2b866d72bf4e9b91793de672e0a57def2 (diff)
parent0c9416429ea4080ff905293b056066651da08699 (diff)
Merge "bugfix: wrong floating ip pool configuration of bare-deployment"
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
index 944f2a64..4ca8176f 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
@@ -77,7 +77,8 @@ public_vip:
public_net_info:
enable: True
network: ext-net
- type: flat
+ type: vlan
+ segment_id: 1411
subnet: ext-subnet
provider_network: physnet
router: router-ext