aboutsummaryrefslogtreecommitdiffstats
path: root/labs
diff options
context:
space:
mode:
Diffstat (limited to 'labs')
-rw-r--r--labs/zte/pod2/daisy/config/deploy.yml13
-rw-r--r--labs/zte/pod2/daisy/config/network.yml21
-rw-r--r--labs/zte/virtual1/daisy/config/deploy.yml16
-rw-r--r--labs/zte/virtual1/daisy/config/network.yml12
-rw-r--r--labs/zte/virtual2/daisy/config/deploy.yml41
-rw-r--r--labs/zte/virtual2/daisy/config/network.yml12
6 files changed, 64 insertions, 51 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'
diff --git a/labs/zte/virtual1/daisy/config/deploy.yml b/labs/zte/virtual1/daisy/config/deploy.yml
index 6197de9..e80d031 100644
--- a/labs/zte/virtual1/daisy/config/deploy.yml
+++ b/labs/zte/virtual1/daisy/config/deploy.yml
@@ -4,19 +4,19 @@ hosts:
roles:
- 'CONTROLLER_LB'
template: 'templates/virtual_environment/vms/controller.xml'
-- name: 'computer01'
+- name: 'controller02'
roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer02'
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+- name: 'controller03'
roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer03'
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+- name: 'computer01'
roles:
- 'COMPUTER'
template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer04'
+- name: 'computer02'
roles:
- 'COMPUTER'
template: 'templates/virtual_environment/vms/computer.xml'
diff --git a/labs/zte/virtual1/daisy/config/network.yml b/labs/zte/virtual1/daisy/config/network.yml
index ac61c8b..b2e8773 100644
--- a/labs/zte/virtual1/daisy/config/network.yml
+++ b/labs/zte/virtual1/daisy/config/network.yml
@@ -11,8 +11,8 @@
network-config-metadata:
title: 'zte-virtual1 network config'
version: '0.1'
- created: 'Mon Oct 31 2016'
- comment:
+ created: 'Tue Apr 11 2017'
+ comment: 'five vm node deploy'
networks:
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
@@ -46,6 +46,12 @@ networks:
- 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'
@@ -57,5 +63,7 @@ interfaces:
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/labs/zte/virtual2/daisy/config/deploy.yml b/labs/zte/virtual2/daisy/config/deploy.yml
index 7b40541..d4c99e9 100644
--- a/labs/zte/virtual2/daisy/config/deploy.yml
+++ b/labs/zte/virtual2/daisy/config/deploy.yml
@@ -1,26 +1,15 @@
-adapter: 'libvirt'
-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: 110
- compute: 110
- ceph: 150
-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/labs/zte/virtual2/daisy/config/network.yml b/labs/zte/virtual2/daisy/config/network.yml
index f0666b6..7b4a501 100644
--- a/labs/zte/virtual2/daisy/config/network.yml
+++ b/labs/zte/virtual2/daisy/config/network.yml
@@ -11,8 +11,8 @@
network-config-metadata:
title: 'zte-virtual2 network config'
version: '0.1'
- created: 'Mon Oct 31 2016'
- comment:
+ created: 'Tue Apr 11 2017'
+ comment: 'all-in-one vm node deploy'
networks:
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
@@ -46,6 +46,12 @@ networks:
- 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'
@@ -57,5 +63,7 @@ interfaces:
interface: 'ens3'
- name: 'TENANT'
interface: 'ens3'
+ - name: 'HEARTBEAT'
+ interface: 'ens9'
internal_vip: '10.20.11.11'
public_vip: '10.20.11.11'