Update daisy config files according to opnfv/daisy repo

1. enable multi-nodes for zte-virtual2
2. enlarge disk sizes
3. add adapter param
4. add physical network mapping param

Change-Id: I5b51e8d460a2514303b622b19bebdf10b20ff38c
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

4 files changed, 57 insertions, 42 deletions

diff --git a/labs/zte/virtual1/daisy/config/deploy.yml b/labs/zte/virtual1/daisy/config/deploy.yml
index 2da7e7f..3f7a19b 100644
--- a/labs/zte/virtual1/daisy/config/deploy.yml
+++ b/labs/zte/virtual1/daisy/config/deploy.yml
@@ -1,14 +1,14 @@
-hosts:
-- name: 'all_in_one'
-  roles:
-    - 'CONTROLLER_LB'
-    - '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: '/dev/sdb'
-
+adapter: 'libvirt'

+hosts:

+- name: 'all_in_one'

+  roles:

+    - 'CONTROLLER_LB'

+    - 'COMPUTER'

+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: ''

diff --git a/labs/zte/virtual1/daisy/config/network.yml b/labs/zte/virtual1/daisy/config/network.yml
index 2e87bad..ac61c8b 100644
--- a/labs/zte/virtual1/daisy/config/network.yml
+++ b/labs/zte/virtual1/daisy/config/network.yml
@@ -9,7 +9,7 @@
 ##############################################################################
 
 network-config-metadata:
-  title: 'zte-virtual network config'
+  title: 'zte-virtual1 network config'
   version: '0.1'
   created: 'Mon Oct 31 2016'
   comment:
@@ -30,9 +30,10 @@ networks:
     gateway: '172.10.101.1'
     ip_ranges:
     - start: '172.10.101.2'
-      end: '172.10.101.100'
+      end: '172.10.101.20'
     name: 'EXTERNAL'
-    network_name: admin_external
+    network_name: 'admin_external'
+    mapping: 'physnet1'
   - cidr: '10.20.11.0/24'
     gateway: '10.20.11.1'
     ip_ranges:
diff --git a/labs/zte/virtual2/daisy/config/deploy.yml b/labs/zte/virtual2/daisy/config/deploy.yml
index 2da7e7f..7b40541 100644
--- a/labs/zte/virtual2/daisy/config/deploy.yml
+++ b/labs/zte/virtual2/daisy/config/deploy.yml
@@ -1,14 +1,26 @@
-hosts:
-- name: 'all_in_one'
-  roles:
-    - 'CONTROLLER_LB'
-    - '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: '/dev/sdb'
-
+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'

diff --git a/labs/zte/virtual2/daisy/config/network.yml b/labs/zte/virtual2/daisy/config/network.yml
index 49ae58e..f0666b6 100644
--- a/labs/zte/virtual2/daisy/config/network.yml
+++ b/labs/zte/virtual2/daisy/config/network.yml
@@ -9,7 +9,7 @@
 ##############################################################################
 
 network-config-metadata:
-  title: 'zte-virtual network config'
+  title: 'zte-virtual2 network config'
   version: '0.1'
   created: 'Mon Oct 31 2016'
   comment:
@@ -17,8 +17,8 @@ networks:
   - cidr: '10.20.11.0/24'
     gateway: '10.20.11.1'
     ip_ranges:
-    - 'start': '10.20.11.3'
-      'end': '10.20.11.10'
+    - start: '10.20.11.3'
+      end: '10.20.11.10'
     name: 'MANAGEMENT'
   - cidr: '10.20.11.0/24'
     gateway: '10.20.11.1'
@@ -27,22 +27,24 @@ networks:
       end: '10.20.11.10'
     name: 'STORAGE'
   - cidr: '172.10.101.0/24'
-    gateway: '172.10.101.0'
+    gateway: '172.10.101.1'
     ip_ranges:
-    - 'start': '172.10.101.1'
-      'end': '172.10.101.10'
-    'name': 'EXTERNAL'
+    - 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'
+    - 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'
+    - start: '10.20.11.3'
+      end: '10.20.11.10'
     name: 'TENANT'
 interfaces:
   - name: 'EXTERNAL'