aboutsummaryrefslogtreecommitdiffstats
path: root/labs/zte/pod2
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-07-07 15:11:42 +0800
committerAlex Yang <yangyang1@zte.com.cn>2017-07-07 15:11:42 +0800
commit941dbfc2ebd8a7e4c7c12e6a83c793cb4cca3695 (patch)
tree8089a779e83ce36e00142339ae7e1a1400587128 /labs/zte/pod2
parentdba4dcb6281bf2416d3da455c252074b5866868a (diff)
enable HA deployment in zte-pods for daisy
Change-Id: I0e72702540309b70afcd752b6f6442218fbf9d75 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'labs/zte/pod2')
-rw-r--r--labs/zte/pod2/daisy/config/deploy.yml13
-rw-r--r--labs/zte/pod2/daisy/config/network.yml21
2 files changed, 21 insertions, 13 deletions
diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
index a5ce219..8014919 100644
--- a/labs/zte/pod2/daisy/config/deploy.yml
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -3,16 +3,16 @@ hosts:
- name: 'controller01'
roles:
- 'CONTROLLER_LB'
-- name: 'computer01'
+- name: 'controller02'
roles:
- - 'COMPUTER'
-- name: 'computer02'
+ - 'CONTROLLER_LB'
+- name: 'controller03'
roles:
- - 'COMPUTER'
-- name: 'computer03'
+ - 'CONTROLLER_LB'
+- name: 'computer01'
roles:
- 'COMPUTER'
-- name: 'computer04'
+- name: 'computer02'
roles:
- 'COMPUTER'
disks:
@@ -21,4 +21,3 @@ daisy_passwd: 'r00tme'
daisy_ip: '10.20.7.3'
daisy_gateway: '10.20.7.1'
ceph_disk_name: '/dev/sdb'
-
diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
index 5d57738..36640c1 100644
--- a/labs/zte/pod2/daisy/config/network.yml
+++ b/labs/zte/pod2/daisy/config/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'