summaryrefslogtreecommitdiffstats
path: root/deploy/conf/hardware_environment
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-07-25 17:01:04 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-08-11 15:06:29 +0800
commit02708db0054bcabf4db151d4b364d70ecc44ef18 (patch)
tree927dca85b79e918ce30d1f96f6c8bd09079777fa /deploy/conf/hardware_environment
parent58f021096b8c7969bcbbc9e06934f0718b71a2b9 (diff)
Adapt network.yml to OpenStack Ansible
JIRA:COMPASS-557 1. modify sys_intf_mappings and ip_settings in network.yml to synchronize with OSA network. networks compass build will be mgmt, external, tenant, storage. 2. modify compass_conf to support new netwok.yml 3. fix some hard coding when transfer ip parameters 4. support heterogeneous network Change-Id: Ib4a8af1f96a40e6456242e3dc2b456e0c8c17c2e Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/conf/hardware_environment')
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network.yml34
1 files changed, 26 insertions, 8 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml
index f6deed4b..cba041da 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-prv
+ - name: br-provider
network: physnet
interface: eth1
type: ovs
@@ -22,9 +22,15 @@ provider_net_mappings:
sys_intf_mappings:
- name: mgmt
+ interface: eth0
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
interface: eth1
vlan_tag: 101
- type: vlan
role:
- controller
- compute
@@ -32,14 +38,13 @@ sys_intf_mappings:
- name: storage
interface: eth1
vlan_tag: 102
- type: vlan
role:
- controller
- compute
- name: external
- interface: br-prv
- type: ovs
+ interface: eth1
+ vlan_tag: None
role:
- controller
- compute
@@ -47,6 +52,19 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
+ - - "10.1.0.100"
+ - "10.1.0.220"
+ 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"
cidr: "172.16.1.0/24"
@@ -74,12 +92,12 @@ ip_settings:
- compute
internal_vip:
- ip: 172.16.1.222
+ ip: 10.1.0.222
netmask: "24"
interface: mgmt
public_vip:
- ip: 192.168.10.51
+ ip: 192.16.1.222
netmask: "24"
interface: external
@@ -88,7 +106,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 10
+ segment_id: 1000
subnet: ext-subnet
provider_network: physnet
router: router-ext