From: Julien <zhang.jun3g@zte.com.cn>
Date: Sun, 26 Feb 2017 14:07:05 +0000 (+0800)
Subject: Update configuration for daisy
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F29391%2F1;p=securedlab.git

Update configuration for daisy

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

diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
index 82a2fe1..14402fe 100644
--- a/labs/zte/pod2/daisy/config/deploy.yml
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -39,5 +39,5 @@ disks:
   controller: 50
   compute: 50
 daisy_passwd: 'r00tme'
-daisy_ip: '10.20.7.2'
+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 dcdc274..a29ee17 100644
--- a/labs/zte/pod2/daisy/config/network.yml
+++ b/labs/zte/pod2/daisy/config/network.yml
@@ -28,35 +28,35 @@ networks:
     ip_ranges:
       - 'start': '192.168.71.1'
         'end': '192.168.71.254'
-    vlan: null
+    vlan_id: null
     name: 'MANAGEMENT'
   - cidr: '192.168.72.0/24'
     gateway: '192.168.72.1'
     ip_ranges:
       - 'start': '192.168.72.1'
         'end': '192.168.72.254'
-    vlan: 172
+    vlan_id: 172
     name: 'STORAGE'
   - cidr: '172.70.0.0/24'
     gateway: '172.70.0.0'
     ip_ranges:
       - 'start': '172.70.0.1'
         'end': '172.70.0.100'
-    vlan: 173
+    vlan_id: 173
     'name': 'EXTERNAL'
   - cidr: '10.20.7.0/24'
     gateway: '10.20.7.1'
     ip_ranges:
       - 'start': '10.20.7.20'
         'end': '10.20.7.200'
-    vlan: 171
+    vlan_id: 171
     name: 'PUBLICAPI'
   - cidr: '192.168.73.0/24'
     gateway: '192.168.73.1'
     ip_ranges:
       - 'start': '192.168.73.1'
         'end': '192.168.73.254'
-    vlan: 1130
+    vlan_id: 1130
     name: 'TENANT'
 interfaces:
   - name: 'EXTERNAL'