Updates to Reflect GIC RO Final HW positions

Corrected with IPMI IPs and correct MACs for POD1 and POD2

Signed-off-by: Dan Smith <lmcdasm@gmail.com>
Change-Id: Ie8af9eb1b07847ba1b4b65096ddc59cd6d43baf3

4 files changed, 82 insertions, 84 deletions

diff --git a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
index 477e769..c31b73b 100644
--- a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
@@ -1,14 +1,14 @@
 dea-pod-override-config-metadata:
   title: 'Deployment Environment Adapter POD override for Ericsson, POD1'
   version: '0.1'
-  created: 'Fri Mar  4 2016'
-  comment: 'None'
+  created: 'Mon Dec  12 2016'
+  comment: 'DASMs last kick'
 environment:
   name: FUEL-BM-POD1
 interfaces_1:
   eno1:
   - fuelweb_admin
-  ens1f0:
+  ens2f0:
   - public
   - management
   - storage
@@ -39,16 +39,16 @@ transformations_1:
     name: eno1
   - action: add-port
     bridge: br-mgmt
-    name: ens1f0.901
+    name: ens2f0.81
   - action: add-port
     bridge: br-storage
-    name: ens1f0.902
+    name: ens2f0.82
   - action: add-port
     bridge: br-ex
-    name: ens1f0.752
+    name: ens2f0.80
   - action: add-port
     bridge: br-mesh
-    name: ens1f0.103
+    name: ens2f0.83
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
@@ -57,14 +57,14 @@ fuel:
     netmask: 255.255.255.0
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 10.118.32.193
+  DNS_UPSTREAM: 8.8.8.8
   FUEL_ACCESS:
     password: admin
     user: admin
   HOSTNAME: fuel
-  NTP1: 10.118.32.193
-  NTP2: ''
-  NTP3: ''
+  NTP1: 0.se.pool.ntp.org
+  NTP2: 1.se.pool.ntp.org
+  NTP3: 2.se.pool.ntp.org
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
@@ -74,8 +74,8 @@ network:
     - 8.8.8.8
     floating_name: admin_floating_net
     floating_ranges:
-    - - 10.118.36.176
-      - 10.118.36.185
+    - - 100.64.200.30
+      - 100.64.200.230
     gre_id_range:
     - 2
     - 65535
@@ -88,11 +88,11 @@ network:
     - 1000
     - 1030
   networks:
-  - cidr: 10.118.36.0/24
-    gateway: 10.118.36.1
+  - cidr: 100.64.200.0/24
+    gateway: 100.64.200.1
     ip_ranges:
-    - - 10.118.36.165
-      - 10.118.36.175
+    - - 100.64.200.10
+      - 100.64.200.29
     meta:
       cidr: 172.16.0.0/24
       configurable: true
@@ -111,7 +111,7 @@ network:
       - vrouter
       vlan_start: null
     name: public
-    vlan_start: 752
+    vlan_start: 80
   - cidr: 192.168.20.0/24
     gateway: null
     ip_ranges:
@@ -126,9 +126,9 @@ network:
       render_addr_mask: storage
       render_type: cidr
       use_gateway: false
-      vlan_start: 102
+      vlan_start: 82
     name: storage
-    vlan_start: 902
+    vlan_start: 82
   - cidr: 192.168.10.0/24
     gateway: null
     ip_ranges:
@@ -146,9 +146,9 @@ network:
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: 81
     name: management
-    vlan_start: 901
+    vlan_start: 81
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:
@@ -164,9 +164,9 @@ network:
       render_type: cidr
       seg_type: tun
       use_gateway: false
-      vlan_start: 103
+      vlan_start: 83
     name: private
-    vlan_start: 103
+    vlan_start: 83
   - cidr: 10.20.0.0/24
     gateway: 10.20.0.2
     ip_ranges:
@@ -192,7 +192,7 @@ settings:
           error: Invalid IP address list
           source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
         type: text
-        value: 10.118.32.193
+        value: 8.8.8.8,8.8.4.4
         weight: 10
       metadata:
         label: Host OS DNS Servers
@@ -208,7 +208,7 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value: 10.118.32.193
+        value: 0.se.pool.ntp.org,1.se.pool.ntp.org,2.se.pool.ntp.org
         weight: 10
     syslog:
       metadata:
diff --git a/labs/ericsson/pod1/fuel/config/dha.yaml b/labs/ericsson/pod1/fuel/config/dha.yaml
index c3bc7ed..d935f9e 100644
--- a/labs/ericsson/pod1/fuel/config/dha.yaml
+++ b/labs/ericsson/pod1/fuel/config/dha.yaml
@@ -14,30 +14,30 @@ adapter: hp
 nodes:
 
 - id: 1
-  pxeMac: 14:58:D0:54:28:80
-  ipmiIp: 10.118.32.201
+  pxeMac: 14:58:D0:54:E7:88
+  ipmiIp: 172.16.1.16
   ipmiUser: opnfv
-  ipmiPass: E///@work
+  ipmiPass: Winter2017
 - id: 2
-  pxeMac: 14:58:D0:55:E2:E0
-  ipmiIp: 10.118.32.202
+  pxeMac: 14:58:D0:54:6A:60
+  ipmiIp: 172.16.1.17
   ipmiUser: opnfv
-  ipmiPass: E///@work
+  ipmiPass: Winter2017
 - id: 3
-  pxeMac: 14:58:D0:54:E7:88
-  ipmiIp: 10.118.32.203
+  pxeMac: 14:58:D0:54:7A:28
+  ipmiIp: 172.16.1.18
   ipmiUser: opnfv
-  ipmiPass: E///@work
+  ipmiPass: Winter2017
 - id: 4
-  pxeMac: 14:58:D0:54:6A:60
-  ipmiIp: 10.118.32.204
+  pxeMac: 9C:B6:54:8A:95:A0
+  ipmiIp: 172.16.1.19
   ipmiUser: opnfv
-  ipmiPass: E///@work
+  ipmiPass: Winter2017
 - id: 5
-  pxeMac: 14:58:D0:54:7A:28
-  ipmiIp: 10.118.32.205
+  pxeMac: 9C:B6:54:8A:10:18
+  ipmiIp: 172.16.1.20
   ipmiUser: opnfv
-  ipmiPass: E///@work
+  ipmiPass: Winter2017
 - id: 6
   libvirtName: fuel-opnfv
   libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
index 34a3ef2..740d8f3 100644
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -2,24 +2,23 @@ dea-pod-override-config-metadata:
   title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2'
 # DEA API version supported
   version: '0.2'
-  created: 'Tue Jun 14 2016'
-  comment: 'Rebased for Fuel 9'
+  created: 'Mon Dec 12 2016'
+  comment: 'DASMs last Kick'
 environment:
   name: FUEL-BM1-POD2
 interfaces_1:
-  eno50:
+  eno49:
   - fuelweb_admin
-  ens1f0:
+  ens2f0:
   - public
   - management
   - storage
   - private
 interfaces_vlan:
-  eno50:
+  eno49:
   - fuelweb_admin
   ens2f0:
   - private
-  ens1f0:
   - public
   - management
   - storage
@@ -31,7 +30,6 @@ interfaces_dpdk:
   - interface_properties:
       dpdk:
         enabled: true
-  ens1f0:
   - public
   - management
   - storage
@@ -44,21 +42,21 @@ fuel:
     ssh_network: 0.0.0.0/0
   DNS_DOMAIN: opnfvericsson.ca
   DNS_SEARCH: opnfvericsson.ca
-  DNS_UPSTREAM: 10.118.32.193
+  DNS_UPSTREAM: 8.8.8.8
   HOSTNAME: fuel-bm1-pod2
-  NTP1: 10.118.32.193
-  NTP2: ''
-  NTP3: ''
+  NTP1: 0.se.pool.ntp.org
+  NTP2: 1.se.pool.ntp.org
+  NTP3: 2.se.pool.ntp.org
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
     configuration_template: null
     dns_nameservers:
-    - 10.118.32.193
+    - 8.8.8.8
     floating_name: admin_floating_net
     floating_ranges:
-    - - 10.118.101.191
-      - 10.118.101.198
+    - - 100.64.201.30
+      - 100.64.201.230
     gre_id_range:
     - 2
     - 65535
@@ -71,11 +69,11 @@ network:
     - 3010
     - 3040
   networks:
-  - cidr: 10.118.101.0/24
-    gateway: 10.118.101.1
+  - cidr: 100.64.201.0/24
+    gateway: 100.64.201.1
     ip_ranges:
-    - - 10.118.101.160
-      - 10.118.101.170
+    - - 100.64.201.10
+      - 100.64.201.29
     meta:
       cidr: 172.16.0.0/24
       configurable: true
@@ -92,9 +90,9 @@ network:
       vips:
       - haproxy
       - vrouter
-      vlan_start: null
+      vlan_start: 84
     name: public
-    vlan_start: 753
+    vlan_start: 84
   - cidr: 192.168.20.0/24
     gateway: null
     ip_ranges:
@@ -109,9 +107,9 @@ network:
       render_addr_mask: storage
       render_type: cidr
       use_gateway: false
-      vlan_start: 102
+      vlan_start: 86
     name: storage
-    vlan_start: 200
+    vlan_start: 86
   - cidr: 192.168.10.0/24
     gateway: null
     ip_ranges:
@@ -129,9 +127,9 @@ network:
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: 85
     name: management
-    vlan_start: 100
+    vlan_start: 85
   - cidr: 192.168.30.0/24
     gateway: null
     ip_ranges:
@@ -147,9 +145,9 @@ network:
       render_type: cidr
       seg_type: tun
       use_gateway: false
-      vlan_start: 103
+      vlan_start: 86
     name: private
-    vlan_start: 300
+    vlan_start: 86
   - cidr: 10.20.0.0/24
     gateway: 10.20.0.2
     ip_ranges:
@@ -177,7 +175,7 @@ settings:
           source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
         type: text_list
         value:
-        - 10.118.32.193
+        - 8.8.8.8
         weight: 10
       metadata:
         group: network
@@ -196,7 +194,7 @@ settings:
           source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
         type: text_list
         value:
-        - 10.118.32.193
+        - 0.se.pool.ntp.org,1.se.pool.ntp.org,2.se.pool.ntp.org
         weight: 10
     syslog:
       metadata:
diff --git a/labs/ericsson/pod2/fuel/config/dha.yaml b/labs/ericsson/pod2/fuel/config/dha.yaml
index a787162..ebe9d1a 100644
--- a/labs/ericsson/pod2/fuel/config/dha.yaml
+++ b/labs/ericsson/pod2/fuel/config/dha.yaml
@@ -14,30 +14,30 @@ adapter: hp
 nodes:
 
 - id: 1
-  pxeMac: ec:b1:d7:a1:bd:68
-  ipmiIp: 10.118.120.235
+  pxeMac: EC:B1:D7:A2:44:A0
+  ipmiIp: 172.16.2.12
   ipmiUser: opnfv
-  ipmiPass: E///@work2
+  ipmiPass: Winter2017
 - id: 2
-  pxeMac: ec:b1:d7:a2:44:a8
-  ipmiIp: 10.118.120.236
+  pxeMac: EC:B1:D7:A2:44:80
+  ipmiIp: 172.16.2.13
   ipmiUser: opnfv
-  ipmiPass: E///@work2
+  ipmiPass: Winter2017
 - id: 3
-  pxeMac: ec:b1:d7:a2:43:c8
-  ipmiIp: 10.118.120.237
+  pxeMac: EC:B1:D7:A2:43:C0
+  ipmiIp: 172.16.2.14
   ipmiUser: opnfv
-  ipmiPass: E///@work2
+  ipmiPass: Winter2017
 - id: 4
-  pxeMac: ec:b1:d7:a2:44:88
-  ipmiIp: 10.118.120.238
+  pxeMac: EC:B1:D7:A1:8B:D0
+  ipmiIp: 172.16.2.15
   ipmiUser: opnfv
-  ipmiPass: E///@work2
+  ipmiPass: Winter2017
 - id: 5
-  pxeMac: ec:b1:d7:a1:8b:d8
-  ipmiIp: 10.118.120.239
+  pxeMac: EC:B1:D7:A1:BD:60
+  ipmiIp: 172.16.2.16
   ipmiUser: opnfv
-  ipmiPass: E///@work2
+  ipmiPass: Winter2017
 - id: 6
   libvirtName: fuel-opnfv
   libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml