Updated information for ERICSSON-POD3 and ERICSSON-POD4

These configs have been tested against new GIC RO DC for HA and NOHA scenarios
removed the reap from both (since they were done manual)

Corrected for DPDK assignment to NIC

Change-Id: I22bfaff02786210fe7d9bba826186104ddd71f6f
Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
(cherry picked from commit 11f61840323a3ad7ba6e6dd1c4200be99c35865b)

2 files changed, 324 insertions, 0 deletions

diff --git a/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml
new file mode 100644
index 0000000..e68aa49
--- /dev/null
+++ b/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml
@@ -0,0 +1,242 @@
+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: 'ERICSSON-POD3 - Manual Authoring of File - Daniel Smith'
+environment:
+  name: ERICSSON-POD4
+interfaces_1:
+  eno49:
+  - fuelweb_admin
+  ens1f0:
+  - public
+  ens1f1:
+  - management
+  - storage
+  - private
+interfaces_vlan:
+  eno49:
+  - fuelweb_admin
+  ens1f0:
+  - public
+  ens1f1:
+  - private
+  - management
+  - storage
+interfaces_dpdk:
+  eno49:
+  - fuelweb_admin
+  ens1f0:
+  - public
+  ens1f1:
+  - management
+  - storage
+  eno50:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+fuel:
+  ADMIN_NETWORK:
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
+    ipaddress: 10.20.0.2
+    netmask: 255.255.255.0
+    ssh_network: 0.0.0.0/0
+  DNS_DOMAIN: opnfvericsson.se
+  DNS_SEARCH: opnfvericsson.se
+  DNS_UPSTREAM: 8.8.8.8
+  HOSTNAME: fuel-ericsson-pod4
+  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:
+    - 8.8.8.4
+    - 8.8.8.8
+    floating_name: admin_floating_net
+    floating_ranges:
+    - - 190.10.2.101
+      - 190.10.2.200
+    gre_id_range:
+    - 2
+    - 65535
+    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
+    vlan_range:
+    - 1020
+    - 1039
+  networks:
+  - cidr: 190.10.2.0/24
+    gateway: 190.10.2.1
+    ip_ranges:
+    - - 190.10.2.15
+      - 190.10.2.100
+    meta:
+      cidr: 172.16.0.0/24
+      configurable: true
+      floating_range_var: floating_ranges
+      ip_range:
+      - 172.16.0.2
+      - 172.16.0.126
+      map_priority: 1
+      name: public
+      notation: ip_ranges
+      render_addr_mask: public
+      render_type: null
+      use_gateway: true
+      vips:
+      - haproxy
+      - vrouter
+      vlan_start: null
+    name: public
+    vlan_start: 206
+  - cidr: 192.168.1.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.1.1
+      - 192.168.1.254
+    meta:
+      cidr: 192.168.1.0/24
+      configurable: true
+      map_priority: 2
+      name: storage
+      notation: cidr
+      render_addr_mask: storage
+      render_type: cidr
+      use_gateway: false
+      vlan_start: 102
+    name: storage
+    vlan_start: 207
+  - cidr: 192.168.0.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.0.1
+      - 192.168.0.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: 209
+  - cidr: 192.168.2.0/24
+    gateway: null
+    ip_ranges:
+    - - 192.168.2.1
+      - 192.168.2.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: 1020
+  - cidr: 10.20.0.0/24
+    gateway: 10.20.0.2
+    ip_ranges:
+    - - 10.20.0.3
+      - 10.20.0.254
+    meta:
+      configurable: false
+      map_priority: 0
+      notation: ip_ranges
+      render_addr_mask: null
+      render_type: null
+      unmovable: true
+      use_gateway: true
+    name: fuelweb_admin
+    vlan_start: null
+settings:
+  editable:
+    external_dns:
+      dns_list:
+        description: List of upstream DNS servers
+        label: DNS list
+        max: 3
+        regex:
+          error: Invalid IP address
+          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:
+        - 8.8.8.8
+        weight: 10
+      metadata:
+        group: network
+        label: Host OS DNS Servers
+        weight: 30
+    external_ntp:
+      metadata:
+        group: network
+        label: Host OS NTP Servers
+        weight: 40
+      ntp_list:
+        description: List of upstream NTP servers
+        label: NTP server list
+        regex:
+          error: Invalid NTP server
+          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
+        type: text_list
+        value:
+        - 0.se.pool.ntp.org
+        - 1.se.pool.ntp.org
+        - 2.se.pool.ntp.org
+        weight: 10
+    syslog:
+      metadata:
+        enabled: false
+        group: logging
+        label: Syslog
+        toggleable: true
+        weight: 50
+      syslog_port:
+        description: Remote syslog port
+        label: Port
+        regex:
+          error: Invalid syslog port
+          source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+        type: text
+        value: '514'
+        weight: 20
+      syslog_server:
+        description: Remote syslog hostname
+        label: Hostname
+        regex:
+          error: Invalid hostname
+          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
+        type: text
+        value: ''
+        weight: 10
+      syslog_transport:
+        label: Syslog transport protocol
+        type: radio
+        value: tcp
+        values:
+        - data: udp
+          description: ''
+          label: UDP
+        - data: tcp
+          description: ''
+          label: TCP
+        weight: 30
diff --git a/labs/ericsson/pod4/fuel/config/dha.yaml b/labs/ericsson/pod4/fuel/config/dha.yaml
new file mode 100644
index 0000000..bf7c58b
--- /dev/null
+++ b/labs/ericsson/pod4/fuel/config/dha.yaml
@@ -0,0 +1,82 @@
+dha-pod-config-metadata:
+  title: Deployment Hardware Adapter (DHA)
+# DHA API version supported
+  version: 0.0.3
+  created: Mon Sep 19 13:41:29 2016
+  comment: ERICSSON-POD4 DHA (SPAREWHEEL IMPLEMENTATION) - lmcdasm
+
+# Adapter to use for this definition
+# adapter: [ipmi|libvirt]
+adapter: ipmi
+
+# Node list.
+# Mandatory properties are id and role.
+# All other properties are adapter specific.
+# For Non-Fuel nodes controlled by:
+#   - ipmi adapter you need to provide:
+#       pxeMac
+#       ipmiIp
+#       ipmiUser
+#       ipmiPass
+#     and you *MAY* provide (optional, not added by reap.py):
+#       ipmiPort
+#   - libvirt adapter you need to provide:
+#       libvirtName: <whatever>
+#       libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml]
+#
+# For the Fuel Node you need to provide:
+#       libvirtName: <whatever>
+#       libvirtTemplate: libvirt/vms/fuel.xml
+#       isFuel: yes
+#       username: root
+#       password: r00tme
+
+nodes:
+
+- id: 1
+  ipmiIp: 164.10.1.12
+  ipmiPass: ci_opnfv
+  ipmiUser: opnfv_ci
+  libvirtName: null
+  libvirtTemplate: null
+  pxeMac: ec:b1:d7:9d:9b:f0
+- id: 2
+  ipmiIp: 164.10.1.13
+  ipmiPass: ci_opnfv
+  ipmiUser: opnfv_ci
+  libvirtName: null
+  libvirtTemplate: null
+  pxeMac: ec:b1:d7:9d:98:40
+- id: 3
+  ipmiIp: 164.10.1.15
+  ipmiPass: ci_opnfv
+  ipmiUser: opnfv_ci
+  libvirtName: null
+  libvirtTemplate: null
+  pxeMac: ec:b1:d7:9d:90:f0
+- id: 4
+  ipmiIp: 164.10.1.16
+  ipmiPass: ci_opnfv
+  ipmiUser: opnfv_ci
+  libvirtName: null
+  libvirtTemplate: null
+  pxeMac: ec:b1:d7:9d:92:60
+- id: 5
+  ipmiIp: 164.10.1.17
+  ipmiPass: ci_opnfv
+  ipmiUser: opnfv_ci
+  libvirtName: null
+  libvirtTemplate: null
+  pxeMac: ec:b1:d7:9d:9c:00
+# Adding the Fuel node as node id 1
+# which may not be correct - please adjust as needed.
+- id: 6
+  isFuel: true
+  libvirtName: FUEL
+  libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
+  password: r00tme
+  username: root
+disks:
+  compute: 100G
+  controller: 100G
+  fuel: 100G