summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/deploy.yml6
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/network.yml21
-rw-r--r--deploy/config/network.py1
-rw-r--r--deploy/config/vm_environment/zte-virtual1/deploy.yml46
-rw-r--r--deploy/config/vm_environment/zte-virtual1/network.yml130
-rw-r--r--deploy/config/vm_environment/zte-virtual2/deploy.yml46
-rw-r--r--deploy/config/vm_environment/zte-virtual2/network.yml130
-rw-r--r--deploy/environment.py2
8 files changed, 207 insertions, 175 deletions
diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
index b8584251..d24a9569 100644
--- a/deploy/config/bm_environment/zte-baremetal1/deploy.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
@@ -3,6 +3,12 @@ hosts:
- name: 'controller01'
roles:
- 'CONTROLLER_LB'
+- name: 'controller02'
+ roles:
+ - 'CONTROLLER_LB'
+- name: 'controller03'
+ roles:
+ - 'CONTROLLER_LB'
- name: 'computer01'
roles:
- 'COMPUTER'
diff --git a/deploy/config/bm_environment/zte-baremetal1/network.yml b/deploy/config/bm_environment/zte-baremetal1/network.yml
index b4140903..77765df8 100644
--- a/deploy/config/bm_environment/zte-baremetal1/network.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/network.yml
@@ -46,12 +46,12 @@ networks:
'name': 'EXTERNAL'
network_name: 'admin_external'
mapping: 'physnet1'
- - 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.20'
- 'end': '10.20.7.200'
- vlan_id: null
+ - 'start': '192.168.71.2'
+ 'end': '192.168.71.254'
+ vlan_id: 171
name: 'PUBLICAPI'
- cidr: '192.168.73.0/24'
gateway: '192.168.73.1'
@@ -60,16 +60,25 @@ networks:
'end': '192.168.73.254'
vlan_id: 1130
name: 'TENANT'
+ - cidr: '10.20.7.0/24'
+ gateway: '10.20.7.1'
+ ip_ranges:
+ - 'start': '10.20.7.20'
+ 'end': '10.20.7.200'
+ vlan_id: null
+ name: 'HEARTBEAT'
interfaces:
- name: 'EXTERNAL'
interface: 'ens44f1'
- name: 'MANAGEMENT'
interface: 'ens12f0'
- name: 'PUBLICAPI'
- interface: 'ens4f0'
+ interface: 'ens12f0'
- name: 'STORAGE'
interface: 'ens12f1'
- name: 'TENANT'
interface: 'ens44f0'
+ - name: 'HEARTBEAT'
+ interface: 'ens4f0'
internal_vip: '192.168.71.10'
public_vip: '10.20.7.11'
diff --git a/deploy/config/network.py b/deploy/config/network.py
index cd38e94d..4d877a75 100644
--- a/deploy/config/network.py
+++ b/deploy/config/network.py
@@ -18,6 +18,7 @@ class NetworkConfig(object):
'STORAGE': 'stor',
'PUBLICAPI': 'pub',
'TENANT': 'tenant',
+ 'HEARTBEAT': 'hbt',
}
def __init__(self, network_file):
diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml
index a85f429f..e80d0310 100644
--- a/deploy/config/vm_environment/zte-virtual1/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml
@@ -1,15 +1,31 @@
-adapter: libvirt
-hosts:
-- name: 'all_in_one'
- roles:
- - 'CONTROLLER_LB'
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/all_in_one.xml'
-disks:
- daisy: 50
- controller: 110
- compute: 110
-daisy_passwd: 'r00tme'
-daisy_ip: '10.20.11.2'
-daisy_gateway: '10.20.11.1'
-ceph_disk_name: ''
+adapter: libvirt
+hosts:
+- name: 'controller01'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+- name: 'controller02'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+- name: 'controller03'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+- name: 'computer01'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
+- name: 'computer02'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
+disks:
+ daisy: 50
+ controller: 110
+ compute: 110
+ ceph: 110
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
+ceph_disk_name: '/dev/sdb'
diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml
index 34b466a2..b2e87735 100644
--- a/deploy/config/vm_environment/zte-virtual1/network.yml
+++ b/deploy/config/vm_environment/zte-virtual1/network.yml
@@ -1,61 +1,69 @@
-##############################################################################
-# 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-virtual1 network config'
- version: '0.1'
- created: 'Mon Oct 31 2016'
- 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
- mapping: physnet1
- - 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'
+##############################################################################
+# 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-virtual1 network config'
+ version: '0.1'
+ created: 'Tue Apr 11 2017'
+ comment: 'five vm node deploy'
+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'
+ mapping: 'physnet1'
+ - 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'
+ - cidr: '100.20.11.0/24'
+ gateway: '100.20.11.1'
+ ip_ranges:
+ - start: '100.20.11.3'
+ end: '100.20.11.10'
+ name: 'HEARTBEAT'
+interfaces:
+ - name: 'EXTERNAL'
+ interface: 'ens8'
+ - name: 'MANAGEMENT'
+ interface: 'ens3'
+ - name: 'PUBLICAPI'
+ interface: 'ens3'
+ - name: 'STORAGE'
+ interface: 'ens3'
+ - name: 'TENANT'
+ interface: 'ens3'
+ - name: 'HEARTBEAT'
+ interface: 'ens9'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'
diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml
index 0202e684..d4c99e97 100644
--- a/deploy/config/vm_environment/zte-virtual2/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml
@@ -1,31 +1,15 @@
-adapter: libvirt
-hosts:
-- name: 'controller01'
- roles:
- - 'CONTROLLER_LB'
- template: 'templates/virtual_environment/vms/controller.xml'
-- name: 'computer01'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer02'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer03'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer04'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-disks:
- daisy: 50
- controller: 110
- compute: 110
- ceph: 110
-daisy_passwd: 'r00tme'
-daisy_ip: '10.20.11.2'
-daisy_gateway: '10.20.11.1'
-ceph_disk_name: '/dev/sdb'
+adapter: libvirt
+hosts:
+- name: 'all_in_one'
+ roles:
+ - 'CONTROLLER_LB'
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/all_in_one.xml'
+disks:
+ daisy: 50
+ controller: 110
+ compute: 110
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
+ceph_disk_name: '' \ No newline at end of file
diff --git a/deploy/config/vm_environment/zte-virtual2/network.yml b/deploy/config/vm_environment/zte-virtual2/network.yml
index 9477ab9c..7b4a501c 100644
--- a/deploy/config/vm_environment/zte-virtual2/network.yml
+++ b/deploy/config/vm_environment/zte-virtual2/network.yml
@@ -1,61 +1,69 @@
-##############################################################################
-# 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
- mapping: physnet1
- - 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'
+##############################################################################
+# 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: 'all-in-one vm node deploy'
+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'
+ mapping: 'physnet1'
+ - 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'
+ - cidr: '100.20.11.0/24'
+ gateway: '100.20.11.1'
+ ip_ranges:
+ - start: '100.20.11.3'
+ end: '100.20.11.10'
+ name: 'HEARTBEAT'
+interfaces:
+ - name: 'EXTERNAL'
+ interface: 'ens8'
+ - name: 'MANAGEMENT'
+ interface: 'ens3'
+ - name: 'PUBLICAPI'
+ interface: 'ens3'
+ - name: 'STORAGE'
+ interface: 'ens3'
+ - name: 'TENANT'
+ interface: 'ens3'
+ - name: 'HEARTBEAT'
+ interface: 'ens9'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'
diff --git a/deploy/environment.py b/deploy/environment.py
index 1cd32980..b3024ed5 100644
--- a/deploy/environment.py
+++ b/deploy/environment.py
@@ -40,7 +40,7 @@ from utils import (
CREATE_QCOW2_PATH = path_join(WORKSPACE, 'tools')
VMDEPLOY_DAISY_SERVER_NET = path_join(WORKSPACE, 'templates/virtual_environment/networks/daisy.xml')
-VMDEPLOY_TARGET_NODE_NET = path_join(WORKSPACE, 'templates/virtual_environment/networks/os-all_in_one.xml')
+VMDEPLOY_TARGET_NODE_NET = path_join(WORKSPACE, 'templates/virtual_environment/networks/external.xml')
VMDEPLOY_DAISY_SERVER_VM = path_join(WORKSPACE, 'templates/virtual_environment/vms/daisy.xml')
BMDEPLOY_DAISY_SERVER_VM = path_join(WORKSPACE, 'templates/physical_environment/vms/daisy.xml')