update according to daisy requirement

Change-Id: Ia5af58aa72d6d3294e4257847cca200c6aa47a0c
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>

2 files changed, 14 insertions, 39 deletions

diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
index 14402fe..38be281 100644
--- a/labs/zte/pod2/daisy/config/deploy.yml
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -1,39 +1,19 @@
 hosts:
-- name: 'node1'
+- name: 'controller01'
   roles:
     - 'CONTROLLER_LB'
-  ipmi:
-    ip: 192.168.1.106
-    user: zteroot
-    password: superuser
-- name: 'node2'
+- name: 'controller02'
   roles:
     - 'CONTROLLER_LB'
-  ipmi:
-    ip: 192.168.1.107
-    user: zteroot
-    password: superuser
-- name: 'node3'
+- name: 'controller03'
   roles:
     - 'CONTROLLER_LB'
-  ipmi:
-    ip: 192.168.1.108
-    user: zteroot
-    password: superuser
-- name: 'node4'
+- name: 'computer01'
   roles:
     - 'COMPUTER'
-  ipmi:
-    ip: 192.168.1.109
-    user: zteroot
-    password: superuser
-- name: 'node5'
+- name: 'computer02'
   roles:
     - 'COMPUTER'
-  ipmi:
-    ip: 192.168.1.110
-    user: zteroot
-    password: superuser
 disks:
   daisy: 50
   controller: 50
diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
index 782d2ca..f3063e2 100644
--- a/labs/zte/pod2/daisy/config/network.yml
+++ b/labs/zte/pod2/daisy/config/network.yml
@@ -22,31 +22,26 @@ network-config-metadata:
   version: '0.1'
   created: 'Feb 2 2017'
   comment: 'For Daisy initial'
-common_parameters:
-  ntp_servers:
-    - 172.10.0.1
-  dns_servers:
-    - 172.10.0.1
 networks:
   - cidr: '192.168.71.0/24'
     gateway: '192.168.71.1'
     ip_ranges:
-      - 'start': '192.168.71.5'
+      - 'start': '192.168.71.2'
         'end': '192.168.71.254'
     vlan_id: 171
     name: 'MANAGEMENT'
   - cidr: '192.168.72.0/24'
     gateway: '192.168.72.1'
     ip_ranges:
-      - 'start': '192.168.72.5'
+      - 'start': '192.168.72.2'
         'end': '192.168.72.254'
     vlan_id: 172
     name: 'STORAGE'
   - cidr: '172.70.0.0/24'
-    gateway: '172.70.0.1'
+    gateway: '172.70.0.0'
     ip_ranges:
-      - 'start': '172.70.0.100'
-        'end': '172.70.0.200'
+      - 'start': '172.70.0.2'
+        'end': '172.70.0.100'
     vlan_id: 173
     'name': 'EXTERNAL'
   - cidr: '10.20.7.0/24'
@@ -59,7 +54,7 @@ networks:
   - cidr: '192.168.73.0/24'
     gateway: '192.168.73.1'
     ip_ranges:
-      - 'start': '192.168.73.5'
+      - 'start': '192.168.73.2'
         'end': '192.168.73.254'
     vlan_id: 1130
     name: 'TENANT'
@@ -67,12 +62,12 @@ interfaces:
   - name: 'EXTERNAL'
     interface: 'ens44f1'
   - name: 'MANAGEMENT'
-    interface: 'ens4f0'
-  - name: 'PUBLICAPI'
     interface: 'ens12f0'
+  - name: 'PUBLICAPI'
+    interface: 'ens4f0'
   - name: 'STORAGE'
     interface: 'ens12f1'
   - name: 'TENANT'
     interface: 'ens44f0'
-internal_vip: '192.168.71.4'
+internal_vip: '192.168.71.10'
 public_vip: '10.20.7.11'