diff options
author | 2017-09-28 11:25:49 +0800 | |
---|---|---|
committer | 2017-09-28 13:39:14 +0000 | |
commit | 1cc2e21facebbb240860429659e2137fe37f5266 (patch) | |
tree | 2c7ffc1bb2e80dda601cbff5a14ccf3147c92f27 /deploy/conf/vm_environment/huawei-virtual3/network.yml | |
parent | 6905f82c89d8d9825494bb10959d61e5f7053451 (diff) |
Modify the network and DHA files
Due to pod2 virtual3 and virtual4 run danube before,
we need to change the network and DHA to run euphrates
Change-Id: I720138cb960cc6f3a57bf5f777c0debb80f64eba
Signed-off-by: wutianwei <wutianwei1@huawei.com>
(cherry picked from commit f70d3aa8ffe7878e86b8f12c91c99018924a74b3)
Diffstat (limited to 'deploy/conf/vm_environment/huawei-virtual3/network.yml')
-rw-r--r-- | deploy/conf/vm_environment/huawei-virtual3/network.yml | 64 |
1 files changed, 45 insertions, 19 deletions
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml index 40238276..4359202e 100644 --- a/deploy/conf/vm_environment/huawei-virtual3/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual3/network.yml @@ -12,34 +12,42 @@ nic_mappings: [] bond_mappings: [] provider_net_mappings: - - name: br-prv + - name: br-provider network: physnet - interface: eth1 + interface: eth10 type: ovs role: - controller - - compute sys_intf_mappings: - name: mgmt + interface: eth0 + type: normal + vlan_tag: None + role: + - controller + - compute + + - name: tenant interface: eth1 + type: normal vlan_tag: 101 - type: vlan role: - controller - compute - name: storage interface: eth1 + type: normal vlan_tag: 102 - type: vlan role: - controller - compute - name: external - interface: br-prv - type: ovs + interface: eth1 + type: normal + vlan_tag: None role: - controller - compute @@ -47,8 +55,21 @@ sys_intf_mappings: ip_settings: - name: mgmt ip_ranges: + - - "10.1.0.50" + - "10.1.0.100" + dhcp_ranges: + - - "10.1.0.2" + - "10.1.0.49" + cidr: "10.1.0.0/24" + gw: "10.1.0.1" + role: + - controller + - compute + + - name: tenant + ip_ranges: - - "172.16.1.1" - - "172.16.1.254" + - "172.16.1.50" cidr: "172.16.1.0/24" role: - controller @@ -57,7 +78,7 @@ ip_settings: - name: storage ip_ranges: - - "172.16.2.1" - - "172.16.2.254" + - "172.16.2.50" cidr: "172.16.2.0/24" role: - controller @@ -65,25 +86,30 @@ ip_settings: - name: external ip_ranges: - - - "192.168.101.210" - - "192.168.101.220" - cidr: "192.168.101.0/24" - gw: "192.168.101.1" + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" role: - controller - compute internal_vip: - ip: 172.16.1.222 + ip: 10.1.0.222 netmask: "24" interface: mgmt public_vip: - ip: 192.168.101.222 + ip: 192.16.1.222 netmask: "24" interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net @@ -94,7 +120,7 @@ public_net_info: router: router-ext enable_dhcp: "False" no_gateway: "False" - external_gw: "192.168.101.1" - floating_ip_cidr: "192.168.101.0/24" - floating_ip_start: "192.168.101.101" - floating_ip_end: "192.168.101.199" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" |