2 files changed, 72 insertions, 71 deletions
diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml
index b0949476..1bf254f5 100644
--- a/deploy/config/vm_environment/zte-virtual1/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml
@@ -1,12 +1,13 @@
-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'
+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'
+deploy_env: 'virtual'
+\ No newline at end of file
diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml
index 36863882..7d746be6 100644
--- a/deploy/config/vm_environment/zte-virtual1/network.yml
+++ b/deploy/config/vm_environment/zte-virtual1/network.yml
@@ -1,59 +1,59 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Coreporation and others.
-# hu.zhijiang@zte.com.cn
-# sun.jing22@zte.com.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-network-config-metadata:
-  title: 'zte-virtual1 network config'
-  version: '0.1'
-  created: 'Mon Oct 31 2016'
-  comment:
-networks:
-  - cidr: '10.20.11.0/24'
-    gateway: '10.20.11.1'
-    ip_ranges:
-    - 'start': '10.20.11.3'
-      'end': '10.20.11.10'
-    name: 'MANAGEMENT'
-  - cidr: '10.20.11.0/24'
-    gateway: '10.20.11.1'
-    ip_ranges:
-    - start: '10.20.11.3'
-      end: '10.20.11.10'
-    name: 'STORAGE'
-  - cidr: '172.10.101.0/24'
-    gateway: '172.10.101.0'
-    ip_ranges:
-    - 'start': '172.10.101.1'
-      'end': '172.10.101.10'
-    'name': 'EXTERNAL'
-  - cidr: '10.20.11.0/24'
-    gateway: '10.20.11.1'
-    ip_ranges:
-    - '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'
-    name: 'TENANT'
-interfaces:
-  - name: 'EXTERNAL'
-    interface: 'ens8'
-  - name: 'MANAGEMENT'
-    interface: 'ens3'
-  - name: 'PUBLICAPI'
-    interface: 'ens3'
-  - name: 'STORAGE'
-    interface: 'ens3'
-  - name: 'TENANT'
-    interface: 'ens3'
-internal_vip: '10.20.11.11'
-public_vip: '10.20.11.11'
+##############################################################################
+# Copyright (c) 2016 ZTE Coreporation and others.
+# hu.zhijiang@zte.com.cn
+# sun.jing22@zte.com.cn
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+network-config-metadata:
+  title: 'zte-virtual1 network config'
+  version: '0.1'
+  created: 'Mon Oct 31 2016'
+  comment:
+networks:
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'MANAGEMENT'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - start: '10.20.11.3'
+      end: '10.20.11.10'
+    name: 'STORAGE'
+  - cidr: '172.10.101.0/24'
+    gateway: '172.10.101.0'
+    ip_ranges:
+    - 'start': '172.10.101.1'
+      'end': '172.10.101.10'
+    'name': 'EXTERNAL'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - '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'
+    name: 'TENANT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens8'
+  - name: 'MANAGEMENT'
+    interface: 'ens3'
+  - name: 'PUBLICAPI'
+    interface: 'ens3'
+  - name: 'STORAGE'
+    interface: 'ens3'
+  - name: 'TENANT'
+    interface: 'ens3'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'