summaryrefslogtreecommitdiffstats
path: root/deploy/config/bm_environment
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-04-08 15:48:40 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-04-11 15:47:58 +0800
commit32028d091e6832704115f3ffa0013783feb6c48e (patch)
treed322c77fcd4e1b275920a98df8f446d585c4d6f1 /deploy/config/bm_environment
parent2cf7f098048ef0c11eb1321747b600230a495c88 (diff)
support mutinode deploy in vm deployment env
Change-Id: Ic9e19d4e120fc53d96d0794239cd6e421f25ea27 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'deploy/config/bm_environment')
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/network.yml68
1 files changed, 41 insertions, 27 deletions
diff --git a/deploy/config/bm_environment/zte-baremetal1/network.yml b/deploy/config/bm_environment/zte-baremetal1/network.yml
index 53f21d90..ad0ec646 100644
--- a/deploy/config/bm_environment/zte-baremetal1/network.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/network.yml
@@ -8,52 +8,66 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+##############################################################################
+# Description
+# MANAGEMENT: used for PXE, vlan used
+# SOTRAGE: used for storage access
+# EXTERNAL: tenant public/floating IP associated network,
+# requires a dedicated interface
+# PUBLICAPI: used for horizon access, openstack API access
+# TENANT: used for tenant access, vlan and VxLan supported, default VxLan
+##############################################################################
network-config-metadata:
- title: 'zte-bm-deploy network config'
+ title: 'Deployment Adapter for baremetal POD'
version: '0.1'
- created: 'Mon Oct 31 2016'
- comment:
+ created: 'Feb 2 2017'
+ comment: 'For Daisy initial'
networks:
- - cidr: '10.20.7.0/24'
- gateway: '10.20.7.1'
+ - cidr: '192.168.71.0/24'
+ gateway: '192.168.71.1'
ip_ranges:
- - 'start': '10.20.7.4'
- 'end': '10.20.7.11'
+ - 'start': '192.168.71.2'
+ 'end': '192.168.71.254'
+ vlan_id: 171
name: 'MANAGEMENT'
- - cidr: '10.20.7.0/24'
- gateway: '10.20.7.1'
+ - cidr: '192.168.72.0/24'
+ gateway: '192.168.72.1'
ip_ranges:
- - start: '10.20.7.4'
- end: '10.20.7.11'
+ - 'start': '192.168.72.2'
+ 'end': '192.168.72.254'
+ vlan_id: 172
name: 'STORAGE'
- - cidr: '172.10.101.0/24'
- gateway: '172.10.101.0'
+ - cidr: '172.70.0.0/24'
+ gateway: '172.70.0.0'
ip_ranges:
- - 'start': '172.10.101.1'
- 'end': '172.10.101.10'
+ - 'start': '172.70.0.2'
+ 'end': '172.70.0.100'
+ vlan_id: 173
'name': 'EXTERNAL'
- cidr: '10.20.7.0/24'
gateway: '10.20.7.1'
ip_ranges:
- - 'start': '10.20.7.4'
- 'end': '10.20.7.11'
+ - 'start': '10.20.7.20'
+ 'end': '10.20.7.200'
+ vlan_id: null
name: 'PUBLICAPI'
- - cidr: '10.20.7.0/24'
- gateway: '10.20.7.1'
+ - cidr: '192.168.73.0/24'
+ gateway: '192.168.73.1'
ip_ranges:
- - 'start': '10.20.7.4'
- 'end': '10.20.7.11'
+ - 'start': '192.168.73.2'
+ 'end': '192.168.73.254'
+ vlan_id: 1130
name: 'TENANT'
interfaces:
- name: 'EXTERNAL'
- interface: 'ens12f1'
+ interface: 'ens44f1'
- name: 'MANAGEMENT'
- interface: 'ens4f0'
+ interface: 'ens12f0'
- name: 'PUBLICAPI'
interface: 'ens4f0'
- name: 'STORAGE'
- interface: 'ens4f0'
+ interface: 'ens12f1'
- name: 'TENANT'
- interface: 'ens4f0'
-internal_vip: '10.20.7.12'
-public_vip: '10.20.7.12'
+ interface: 'ens44f0'
+internal_vip: '192.168.71.10'
+public_vip: '10.20.7.11'