arm-virtual2: Add local_env with bridge info

While at it, remove obsolete arm-virtual1 local_env configuration,
as well as old Fuel configuration for arm-virtual_kvm.

Change-Id: I17aab716a33c0ceca993b2cfb552a240e691bec7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

4 files changed, 1 insertions, 447 deletions

diff --git a/labs/arm/virtual1/fuel/config/local_env b/labs/arm/virtual1/fuel/config/local_env
deleted file mode 100644
index 5befecd..0000000
--- a/labs/arm/virtual1/fuel/config/local_env
+++ /dev/null
@@ -1,3 +0,0 @@
-export LIBVIRT_DEFAULT_URI=qemu+ssh://jenkins@10.0.9.5/system
-export DEFAULT_BRIDGE=admin8_br0,public8_br0
-export DEPLOY_TIMEOUT=360
diff --git a/labs/arm/virtual2/fuel/config/local_env b/labs/arm/virtual2/fuel/config/local_env
new file mode 100644
index 0000000..8e8bb39
--- /dev/null
+++ b/labs/arm/virtual2/fuel/config/local_env
@@ -0,0 +1 @@
+export DEFAULT_BRIDGE=admin8_br0,public8_br0
diff --git a/labs/arm/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/arm/virtual_kvm/fuel/config/dea-pod-override.yaml
deleted file mode 100755
index 9556ddd..0000000
--- a/labs/arm/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,376 +0,0 @@
-dea-pod-override-config-metadata:
-  title: 'Deployment Environment Adapter POD override for Enea Armband virtual PODs'
-  version: '1.1'
-  created: Wed Nov 16 21:13:19 2016
-  comment: 'Created for Enea Armband Lab'
-  public_bridge: 'public8_br0'
-environment:
-  name: armband_opnfv_virt
-  net_segment_type: tun
-wanted_release: Newton on Ubuntu 16.04 (aarch64)
-nodes:
-- id: 1
-  interfaces: interfaces_1
-  role: controller
-  transformations: transformations_1
-- id: 2
-  interfaces: interfaces_1
-  role: controller
-  transformations: transformations_1
-- id: 3
-  interfaces: interfaces_1
-  role: controller
-  transformations: transformations_1
-- id: 4
-  interfaces: interfaces_1
-  role: compute
-  transformations: transformations_2
-- id: 5
-  interfaces: interfaces_1
-  role: compute
-  transformations: transformations_2
-interfaces_1:
-  eth0:
-  - management
-  - storage
-  - private
-  - interface_properties:
-      mtu:
-        value:
-          value: 9000
-  eth1:
-  - public
-  - interface_properties:
-      mtu:
-        value:
-          value: 9000
-  eth2:
-  - fuelweb_admin
-  - interface_properties:
-      mtu:
-        value:
-          value: 9000
-transformations_1:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-ex
-  - action: add-br
-    name: br-floating
-    provider: ovs
-  - action: add-patch
-    bridges:
-    - br-floating
-    - br-ex
-    mtu: 65000
-    provider: ovs
-  - action: add-br
-    name: br-mesh
-  - action: add-port
-    bridge: br-mgmt
-    name: eth0.2203
-  - action: add-port
-    bridge: br-storage
-    name: eth0.2204
-  - action: add-port
-    bridge: br-mesh
-    name: eth0.2205
-  - action: add-port
-    bridge: br-ex
-    name: eth1
-  - action: add-port
-    bridge: br-fw-admin
-    name: eth2
-transformations_2:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-mesh
-  - action: add-port
-    bridge: br-mgmt
-    name: eth0.2203
-  - action: add-port
-    bridge: br-storage
-    name: eth0.2204
-  - action: add-port
-    bridge: br-mesh
-    name: eth0.2205
-  - action: add-port
-    bridge: br-fw-admin
-    name: eth2
-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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 8.8.8.8
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-  HOSTNAME: fuel
-  IFCFG_ETH1:
-    device: eth1
-    gateway: 10.0.9.254
-    ipaddress: 10.0.9.10
-    netmask: 255.255.255.0
-  NTP1: 0.pool.ntp.org
-  NTP2: 1.pool.ntp.org
-  NTP3: 2.pool.ntp.org
-network:
-  networking_parameters:
-    base_mac: fa:16:3e:00:00:00
-    configuration_template: null
-    dns_nameservers:
-    - 8.8.4.4
-    - 8.8.8.8
-    floating_name: admin_floating_net
-    floating_ranges:
-    - - 10.0.9.101
-      - 10.0.9.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:
-    - 1000
-    - 1030
-  networks:
-  - cidr: 10.0.9.0/24
-    gateway: 10.0.9.254
-    ip_ranges:
-    - - 10.0.9.40
-      - 10.0.9.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: null
-  - 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: 2204
-  - 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: 2203
-  - 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: 2205
-  - 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:
-    common:
-      run_ping_checker:
-        description: Uncheck this box if the public gateway will not be available
-          or will not respond to ICMP requests to the deployed cluster. If unchecked,
-          the controllers will not take public gateway availability into account as
-          part of the cluster health.  If the cluster will not have internet access,
-          you will need to make sure to provide proper offline mirrors for the deployment
-          to succeed.
-        group: network
-        label: Public Gateway is Available
-        type: checkbox
-        value: true
-        weight: 50
-    external_dns:
-      dns_list:
-        description: List of upstream DNS servers
-        label: DNS list
-        max: 3
-        min: 0
-        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
-        min: 1
-        regex:
-          error: Invalid NTP server
-          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
-        type: text_list
-        value:
-        - 0.pool.ntp.org
-        - 1.pool.ntp.org
-        - 2.pool.ntp.org
-        weight: 10
-    kernel_params:
-      kernel:
-        description: Default kernel parameters
-        label: Initial parameters
-        type: text
-        value: console=ttyAMA0,115200 console=ttyS0,115200 net.ifnames=1 biosdevname=0
-          rootdelay=90 nomodeset
-    repo_setup:
-      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-local
-          priority: null
-          section: main
-          suite: xenial
-          type: deb
-          uri: http://10.20.0.2:8080/mirrors/ubuntu/
-        - name: ubuntu
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://ports.ubuntu.com/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://ports.ubuntu.com/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://ports.ubuntu.com/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.0/ubuntu/x86_64
-        - name: mos-updates
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-updates
-          type: deb
-          uri: http://linux.enea.com/mos-repos/ubuntu/10.0
-        - name: mos-security
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-security
-          type: deb
-          uri: http://linux.enea.com/mos-repos/ubuntu/10.0
-        - name: mos-holdback
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-holdback
-          type: deb
-          uri: http://linux.enea.com/mos-repos/ubuntu/10.0
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.0/ubuntu/auxiliary
diff --git a/labs/arm/virtual_kvm/fuel/config/dha.yaml b/labs/arm/virtual_kvm/fuel/config/dha.yaml
deleted file mode 100755
index 2f5659b..0000000
--- a/labs/arm/virtual_kvm/fuel/config/dha.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for ARM Lab, virtual-kvm environment
-  version: 1.1
-  created: Wed Nov 16 21:13:19 2016
-  comment: Config for Enea Armband Lab, virtual-kvm environment
-
-# Adapter to use for this definition
-adapter: libvirt
-
-# Node list.
-# Mandatory property is id, all other properties are adapter specific.
-
-nodes:
-- id: 1
-  libvirtName: controller1
-  libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
-- id: 2
-  libvirtName: controller2
-  libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
-- id: 3
-  libvirtName: controller3
-  libvirtTemplate: templates/arm/virtual_environment/vms/controller.xml
-- id: 4
-  libvirtName: compute1
-  libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
-- id: 5
-  libvirtName: compute2
-  libvirtTemplate: templates/arm/virtual_environment/vms/compute.xml
-- id: 6
-  libvirtName: fuel-master
-  libvirtTemplate: templates/arm/virtual_environment/vms/fuel.xml
-  libvirtUri: qemu+ssh://jenkins@10.0.2.5/system
-  isFuel: yes
-  username: root
-  password: r00tme
-
-virtNetConfDir: templates/arm/virtual_environment/networks
-
-disks:
-  fuel: 100G
-  controller: 100G
-  compute: 100G
-
-# Here the infrastructure VMs can be defined.
-# The entries are not mandatory! If it is left empty
-# the default defined in deploy/templates will
-# be used.
-define_vms:
-  controller:
-    vcpu:
-      value: 8
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 12582912
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 12582912
-  compute:
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456