bugfix dea-pod-override.yaml of zte-pod2

JIRA: PHAROS-245

Change-Id: Ibeba524b53f01edaeab3d7ebe57f43213af0c39f
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
index fdacd1d..31c71c6 100644 (file)
--- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
@@ -13,7 +13,7 @@ dea-pod-override-config-metadata:
   created: 'Jan 26 2016'
   comment: 'Rebased for Fuel8'
 environment:
-  name: opnfv-zte
+  name: opnfv
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.7.200
@@ -22,7 +22,7 @@ fuel:
     netmask: 255.255.255.0
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 114.114.114.114
+  DNS_UPSTREAM: 172.70.0.1
   HOSTNAME: fuel
   NTP1: 172.70.0.1
   NTP2:
@@ -67,28 +67,29 @@ transformations_1:
     name: ens12f1.172
   - action: add-port
     bridge: br-mesh
-    name: ens44f0.1170
+    name: ens44f0.1130
   - action: add-port
     bridge: br-ex
     name: ens44f1.173
   - action: add-port
     bridge: br-fw-admin
     name: ens4f0
+  version: '1.1'
 network:
   networking_parameters:
-    base_mac: fa:16:7e:00:00:00
+    base_mac: fa:16:3e:00:00:00
     configuration_template: null
     dns_nameservers:
     - 172.70.0.1
     floating_name: admin_floating_net
     floating_ranges:
     - - 172.70.0.130
-      - 172.30.0.230
+      - 172.70.0.230
     gre_id_range:
     - 2
     - 65535
-    internal_cidr: 192.168.117.0/24
-    internal_gateway: 192.168.117.1
+    internal_cidr: 192.168.111.0/24
+    internal_gateway: 192.168.111.1
     internal_name: admin_internal_net
     net_l23_provider: ovs
     segmentation_type: tun
@@ -96,8 +97,52 @@ network:
     - 1000
     - 1030
   networks:
+  - cidr: 192.168.71.0/24
+    gateway: null
+    group_id: 2
+    id: 7
+    ip_ranges:
+    - - 192.168.71.1
+      - 192.168.71.254
+    meta:
+      cidr: 192.168.0.0/24
+      configurable: true
+      map_priority: 2
+      name: management
+      notation: cidr
+      render_addr_mask: internal
+      render_type: cidr
+      use_gateway: false
+      vips:
+      - haproxy
+      - vrouter
+      vlan_start: 101
+    name: management
+    vlan_start: 171
+  - cidr: 192.168.73.0/24
+    gateway: null
+    group_id: 2
+    id: 9
+    ip_ranges:
+    - - 192.168.73.1
+      - 192.168.73.254
+    meta:
+      cidr: 192.168.2.0/24
+      configurable: true
+      map_priority: 2
+      name: private
+      notation: cidr
+      render_addr_mask: null
+      render_type: cidr
+      seg_type: tun
+      use_gateway: false
+      vlan_start: 103
+    name: private
+    vlan_start: 1130
   - cidr: 172.70.0.0/24
     gateway: 172.70.0.1
+    group_id: 2
+    id: 6
     ip_ranges:
     - - 172.70.0.10
       - 172.70.0.126
@@ -122,8 +167,8 @@ network:
     vlan_start: 173
   - cidr: 192.168.72.0/24
     gateway: null
-    group_id: 3
-    id: 12
+    group_id: 2
+    id: 8
     ip_ranges:
     - - 192.168.72.1
       - 192.168.72.254
@@ -139,46 +184,6 @@ network:
       vlan_start: 102
     name: storage
     vlan_start: 172
-  - cidr: 192.168.71.0/24
-    gateway: null
-    group_id: 3
-    id: 11
-    ip_ranges:
-    - - 192.168.71.1
-      - 192.168.71.254
-    meta:
-      cidr: 192.168.0.0/24
-      configurable: true
-      map_priority: 2
-      name: management
-      notation: cidr
-      render_addr_mask: internal
-      render_type: cidr
-      use_gateway: false
-      vips:
-      - haproxy
-      - vrouter
-      vlan_start: 101
-    name: management
-    vlan_start: 171
-  - cidr: 192.168.73.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.73.1
-      - 192.168.73.254
-    meta:
-      cidr: 192.168.2.0/24
-      configurable: true
-      map_priority: 2
-      name: private
-      notation: cidr
-      render_addr_mask: null
-      render_type: cidr
-      seg_type: tun
-      use_gateway: false
-      vlan_start: 103
-    name: private
-    vlan_start: 1170
   - cidr: 10.20.7.0/24
     gateway: 10.20.7.2
     group_id: null
@@ -286,4 +291,55 @@ settings:
         type: checkbox
         value: true
         weight: 30
+    repo_setup:
+      metadata:
+        always_editable: true
+        group: general
+        label: Repositories
+        weight: 50
+      repos:
+        description: 'Please note: the first repository will be considered the operating
+          system mirror that will be used during node provisioning.
+
+          To create a local repository mirror on the Fuel master node, please follow
+          the instructions provided by running "fuel-createmirror --help" on the Fuel
+          master node.
+
+          Please make sure your Fuel master node has Internet access to the repository
+          before attempting to create a mirror.
+
+          '
+        extra_priority: null
+        type: custom_repo_configuration
+        value:
+        - name: ubuntu
+          priority: null
+          section: main universe multiverse
+          suite: trusty
+          type: deb
+          uri: http://10.20.7.2:8080/mirrors/ubuntu/
+        - name: ubuntu-updates
+          priority: null
+          section: main universe multiverse
+          suite: trusty-updates
+          type: deb
+          uri: http://10.20.7.2:8080/mirrors/ubuntu/
+        - name: ubuntu-security
+          priority: null
+          section: main universe multiverse
+          suite: trusty-security
+          type: deb
+          uri: http://10.20.7.2:8080/mirrors/ubuntu/
+        - name: mos
+          priority: 1050
+          section: main restricted
+          suite: mos9.0
+          type: deb
+          uri: http://10.20.7.2:8080/mitaka-9.0/ubuntu/x86_64
+        - name: Auxiliary
+          priority: 1150
+          section: main restricted
+          suite: auxiliary
+          type: deb
+          uri: http://10.20.7.2:8080/mitaka-9.0/ubuntu/auxiliary