Update the gateway info in daisy baremetal deploy

1. update gateway
2. add adapter info
3. remove useless disks info

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

diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
index 5a85567..3b3eaf5 100644 (file)
--- a/labs/zte/pod2/daisy/config/deploy.yml
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -1,3 +1,4 @@
+adapter: ipmi
 hosts:
 - name: 'controller01'
   roles:
@@ -16,8 +17,6 @@ hosts:
     - 'COMPUTER'
 disks:
   daisy: 50
-  controller: 50
-  compute: 50
 daisy_passwd: 'r00tme'
 daisy_ip: '10.20.7.3'
 daisy_gateway: '10.20.7.1'

diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
index f7126ce..5d57738 100644 (file)
--- a/labs/zte/pod2/daisy/config/network.yml
+++ b/labs/zte/pod2/daisy/config/network.yml
@@ -10,7 +10,7 @@
 
 ##############################################################################
 # Description
-# MANAGEMENT: used for PXE, no vlan used
+# MANAGEMENT: used for PXE, vlan used
 # SOTRAGE: used for storage access
 # EXTERNAL: tenant public/floating IP associated network,
 #     requires a dedicated interface
@@ -38,7 +38,7 @@ networks:
     vlan_id: 172
     name: 'STORAGE'
   - cidr: '172.70.0.0/24'
-    gateway: '172.70.0.0'
+    gateway: '172.70.0.1'
     ip_ranges:
       - 'start': '172.70.0.2'
         'end': '172.70.0.100'