From 32028d091e6832704115f3ffa0013783feb6c48e Mon Sep 17 00:00:00 2001 From: zhouya Date: Sat, 8 Apr 2017 15:48:40 +0800 Subject: support mutinode deploy in vm deployment env Change-Id: Ic9e19d4e120fc53d96d0794239cd6e421f25ea27 Signed-off-by: zhouya --- .../bm_environment/zte-baremetal1/network.yml | 68 +++++++++++++--------- .../config/vm_environment/zte-virtual1/deploy.yml | 2 +- .../config/vm_environment/zte-virtual2/deploy.yml | 24 ++++++++ .../config/vm_environment/zte-virtual2/network.yml | 60 +++++++++++++++++++ 4 files changed, 126 insertions(+), 28 deletions(-) create mode 100644 deploy/config/vm_environment/zte-virtual2/deploy.yml create mode 100644 deploy/config/vm_environment/zte-virtual2/network.yml (limited to 'deploy/config') 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' diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index 12fa1690..14508fae 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -10,4 +10,4 @@ disks: daisy_passwd: 'r00tme' daisy_ip: '10.20.11.2' daisy_gateway: '10.20.11.1' -ceph_disk_name: '/dev/sdb' +ceph_disk_name: '' diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml new file mode 100644 index 00000000..f2c8ac11 --- /dev/null +++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml @@ -0,0 +1,24 @@ +hosts: +- name: 'controller01' + roles: + - 'CONTROLLER_LB' +- name: 'controller02' + roles: + - 'CONTROLLER_LB' +- name: 'controller03' + roles: + - 'CONTROLLER_LB' +- name: 'computer01' + roles: + - 'COMPUTER' +- name: 'computer02' + roles: + - 'COMPUTER' +disks: + daisy: 50 + controller: 50 + compute: 50 +daisy_passwd: 'r00tme' +daisy_ip: '10.20.11.2' +daisy_gateway: '10.20.11.1' +ceph_disk_name: '' diff --git a/deploy/config/vm_environment/zte-virtual2/network.yml b/deploy/config/vm_environment/zte-virtual2/network.yml new file mode 100644 index 00000000..28d531ce --- /dev/null +++ b/deploy/config/vm_environment/zte-virtual2/network.yml @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2016 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +network-config-metadata: + title: 'zte-virtual2 network config' + version: '0.1' + created: 'Tue Apr 11 2017' + comment: +networks: + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'MANAGEMENT' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'STORAGE' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.1' + ip_ranges: + - start: 172.10.101.2 + end: 172.10.101.20 + name: EXTERNAL + network_name: admin_external + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'PUBLICAPI' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'TENANT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens8' + - name: 'MANAGEMENT' + interface: 'ens3' + - name: 'PUBLICAPI' + interface: 'ens3' + - name: 'STORAGE' + interface: 'ens3' + - name: 'TENANT' + interface: 'ens3' +internal_vip: '10.20.11.11' +public_vip: '10.20.11.11' -- cgit 1.2.3-korg