summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-01-06 13:21:32 +0800
committermeimei <meimei@huawei.com>2016-01-06 13:21:32 +0800
commitbe2c0924a582137b030d27b8bcff6761908486d8 (patch)
tree9b5c504c131fb3a9fd114902db0a381e3960cac0 /deploy/conf
parent1fb4836b5b4273f83743111bc8a11ac4099ef859 (diff)
bugfix: wrong floating ip pool configuration of bare-deployment
temporarily remove host3 of baremental-deployment until host3's network is recoverd Change-Id: I760a5afeb229685844b6fb0f5c9577d810a422f2 Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml7
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml11
2 files changed, 5 insertions, 13 deletions
diff --git a/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml b/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
index 0d5e9b40..b1f914dc 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
@@ -22,13 +22,6 @@ hosts:
- controller
- ha
- - name: host3
- mac: '4C:B1:6C:90:57:E4'
- ipmiIp: 10.145.140.203
- roles:
- - controller
- - ha
-
- name: host4
mac: '4C:B1:6C:90:57:D8'
ipmiIp: 10.145.140.204
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 2b426b42..944f2a64 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
@@ -77,14 +77,13 @@ public_vip:
public_net_info:
enable: True
network: ext-net
- type: vlan
- segment_id: 1411
+ type: flat
subnet: ext-subnet
provider_network: physnet
router: router-ext
enable_dhcp: False
no_gateway: False
- external_gw: "192.168.140.1"
- floating_ip_cidr: "192.168.140.0/24"
- floating_ip_start: "192.168.140.121"
- floating_ip_end: "192.168.140.231"
+ external_gw: "10.145.140.1"
+ floating_ip_cidr: "10.145.140.0/24"
+ floating_ip_start: "10.145.140.121"
+ floating_ip_end: "10.145.140.231"