summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin-chi <chigang@huawei.com>2016-01-11 09:41:41 +0800
committerJustin chi <chigang@huawei.com>2016-01-11 03:25:59 +0000
commit807bd4a6b81f6574a7f8c489220c1d0a1815a1e7 (patch)
tree3448653cd5354ba442e8794239de50aecd03f7cd
parent946eb1fca19b9d25ec4d55f639b07cbd233f4fe0 (diff)
update huawei-us-pod1 network and dha information.
because the network is not very stable,so I change the configuration of the POD1 Change-Id: I6dbf55fc8f73b447256566025a463be9258ca62c Signed-off-by: Justin-chi <chigang@huawei.com> (cherry picked from commit c2dd674b7c65256dfa88d97a5604a592e9a024fd)
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml29
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml28
2 files changed, 34 insertions, 23 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 b1f914dc..c7e93354 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/dha.yml
@@ -4,32 +4,43 @@ FLAVOR: cluster
POWER_TOOL: ipmitool
ipmiUser: root
-ipmiPass: root
ipmiVer: '2.0'
hosts:
- name: host1
- mac: '80:FB:06:35:8C:84'
- ipmiIp: 10.145.140.201
+ mac: '70:7B:E8:77:7B:5F'
+ ipmiIp: 172.16.130.27
+ ipmiPass: huawei@123
roles:
- controller
- ha
- name: host2
- mac: '4C:B1:6C:90:57:CF'
- ipmiIp: 10.145.140.202
+ mac: 'E0:24:7F:02:15:A3'
+ ipmiIp: 172.16.130.28
+ ipmiPass: huawei@123
roles:
- controller
- ha
+ - name: host3
+ mac: 'D8:49:0B:DA:2A:28'
+ ipmiIp: 172.16.130.29
+ ipmiPass: Huawei@123
+ roles:
+ - compute
+
- name: host4
- mac: '4C:B1:6C:90:57:D8'
- ipmiIp: 10.145.140.204
+ mac: 'D8:49:0B:DA:5B:5D'
+ ipmiIp: 172.16.130.30
+ ipmiPass: Huawei@123
roles:
- compute
- name: host5
- mac: '4C:B1:6C:90:57:D2'
- ipmiIp: 10.145.140.205
+ mac: 'D8:49:0B:DA:56:85'
+ ipmiIp: 172.16.130.31
+ ipmiPass: Huawei@123
roles:
- compute
+
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 4ca8176f..154f4150 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
@@ -29,8 +29,7 @@ sys_intf_mappings:
- name: external
interface: br-prv
- vlan_tag: 1411
- type: vlan
+ type: ovs
role:
- controller
- compute
@@ -56,10 +55,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.100"
- - "10.145.140.110"
- cidr: "10.145.140.0/23"
- gw: "10.145.140.1"
+ - - "192.168.10.10"
+ - "192.168.10.50"
+ cidr: "192.168.10.0/24"
+ gw: "192.168.10.1"
role:
- controller
- compute
@@ -70,21 +69,22 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 10.145.140.111
- netmask: "23"
+ ip: 192.168.10.51
+ netmask: "24"
interface: external
+onos_nic: eth2
public_net_info:
enable: True
network: ext-net
- type: vlan
- segment_id: 1411
+ type: flat
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
enable_dhcp: False
no_gateway: False
- 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"
+ external_gw: "192.168.10.1"
+ floating_ip_cidr: "192.168.10.0/24"
+ floating_ip_start: "192.168.10.100"
+ floating_ip_end: "192.168.10.200"