aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-17 20:05:04 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-17 20:05:04 +0200
commit51ef955b8cfaa565ed09686f1dd2ba654be75b99 (patch)
treed7f1184e9048ee03d1cd4647ced8fbd9457718a6
parent81118b1ccc33d11bb2651c536ec0b3c959188e98 (diff)
arm-pods: Remove obsolete pods and config files
- arm-pod1 was dismembered; - arm-pod2 will be restored later after the jump server is replaced; - arm-pod3 becomes arm-pod5, remove old Fuel specific config; Change-Id: Ia1d087a38583e8f3963f4f2aa2e903240e7df099 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--labs/arm/pod1/fuel/config/dea-pod-override.yaml332
-rw-r--r--labs/arm/pod1/fuel/config/dha.yaml79
-rw-r--r--labs/arm/pod1/fuel/config/local_env3
-rw-r--r--labs/arm/pod2/fuel/config/dea-pod-override.yaml399
-rw-r--r--labs/arm/pod2/fuel/config/dha.yaml87
-rw-r--r--labs/arm/pod2/fuel/config/local_env3
-rw-r--r--labs/arm/pod3/fuel/config/dea-pod-override.yaml328
-rw-r--r--labs/arm/pod3/fuel/config/dha.yaml86
-rw-r--r--labs/arm/pod5/fuel/config/local_env (renamed from labs/arm/pod3/fuel/config/local_env)0
9 files changed, 0 insertions, 1317 deletions
diff --git a/labs/arm/pod1/fuel/config/dea-pod-override.yaml b/labs/arm/pod1/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 9fcb565..0000000
--- a/labs/arm/pod1/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,332 +0,0 @@
-dea-pod-override-config-metadata:
- title: 'DEA for Enea Armband lab'
- version: '0.1'
- created: 'Mon May 2 2016'
- comment: 'Armband specific'
- public_bridge: 'public6_br0'
-environment:
- name: armband_opnfv
- net_segment_type: tun
-wanted_release: Newton on Ubuntu 16.04 (aarch64)
-interfaces_1:
- enm2p1s0f2:
- - storage
- - interface_properties:
- mtu:
- value:
- value: 9000
- enm2p1s0f3:
- - public
- - management
- - private
- - interface_properties:
- mtu:
- value:
- value: 9000
- enm5p144s0:
- - 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-ex
- name: enm2p1s0f3
- - action: add-port
- bridge: br-mgmt
- name: enm2p1s0f3.2164
- - action: add-port
- bridge: br-storage
- name: enm2p1s0f3.2163
- - action: add-port
- bridge: br-mesh
- name: enm2p1s0f3.2165
- - action: add-port
- bridge: br-fw-admin
- name: enm5p144s0
-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
- IFCFG_ETH1:
- device: eth1
- ipaddress: 10.0.7.10
- netmask: 255.255.255.0
- gateway: 10.0.7.254
- DNS_DOMAIN: domain.tld
- DNS_SEARCH: domain.tld
- DNS_UPSTREAM: 8.8.8.8
- FUEL_ACCESS:
- password: admin
- user: admin
- HOSTNAME: fuel
- 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.7.101
- - 10.0.7.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.7.0/24
- gateway: 10.0.7.254
- ip_ranges:
- - - 10.0.7.40
- - 10.0.7.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: 2163
- - 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: 2164
- - 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: 2165
- - 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=tty0 console=ttyS0,115200 console=ttyAMA0,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/pod1/fuel/config/dha.yaml b/labs/arm/pod1/fuel/config/dha.yaml
deleted file mode 100644
index 16757c8..0000000
--- a/labs/arm/pod1/fuel/config/dha.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-dha-pod-config-metadata:
- title: Deployment Hardware Adapter (DHA)
- # DHA API version supported
- version: 0.0.3
- created: Sat Apr 16 11:34:39 2016
- comment: Enea Armband arm-pod1 DHA (Cavium ThunderX)
-
-# 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
-# - 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: 10.0.1.35
- ipmiPass: admin
- ipmiUser: admin
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 68:05:ca:3d:93:0f
-- id: 2
- ipmiIp: 10.0.1.32
- ipmiPass: admin
- ipmiUser: admin
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 68:05:ca:34:60:e3
-- id: 3
- ipmiIp: 10.0.1.33
- ipmiPass: admin
- ipmiUser: admin
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 68:05:ca:3f:7f:f3
-- id: 4
- ipmiIp: 10.0.1.34
- ipmiPass: admin
- ipmiUser: admin
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 68:05:ca:3d:93:0c
-- id: 5
- ipmiIp: 10.0.1.31
- ipmiPass: admin
- ipmiUser: admin
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 68:05:ca:3d:93:14
-# Adding the Fuel node as node id 5
-# which may not be correct - please adjust as needed.
-- id: 6
- isFuel: true
- libvirtName: armband-pod1
- libvirtTemplate: templates/hardware_environment/vms/enea_lab/fuel.xml
- password: r00tme
- username: root
-disks:
- compute: 100G
- controller: 100G
- fuel: 100G
diff --git a/labs/arm/pod1/fuel/config/local_env b/labs/arm/pod1/fuel/config/local_env
deleted file mode 100644
index 320e7cd..0000000
--- a/labs/arm/pod1/fuel/config/local_env
+++ /dev/null
@@ -1,3 +0,0 @@
-export LIBVIRT_DEFAULT_URI=qemu+ssh://jenkins@10.0.2.5/system
-export DEFAULT_BRIDGE=admin6_br0,public6_br0
-export DEPLOY_TIMEOUT=360
diff --git a/labs/arm/pod2/fuel/config/dea-pod-override.yaml b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 61e9695..0000000
--- a/labs/arm/pod2/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,399 +0,0 @@
-dea-pod-override-config-metadata:
- title: 'DEA for Enea Armband lab'
- version: 1.1
- created: Mon Jun 13 14:28:57 2016
- comment: 'Armband specific'
- public_bridge: 'public_br0'
-environment:
- name: armband_opnfv
-wanted_release: Newton on Ubuntu 16.04 (aarch64)
-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.2.254
- ipaddress: 10.0.2.10
- netmask: 255.255.255.0
- NTP1: 0.pool.ntp.org
- NTP2: 1.pool.ntp.org
- NTP3: 2.pool.ntp.org
-interfaces_1:
- ene18:
- - fuelweb_admin
- - interface_properties:
- mtu:
- value:
- value: 9000
- ene25:
- - public
- - management
- - storage
- - private
- - interface_properties:
- mtu:
- value:
- value: 9000
-interfaces_2:
- ene10:
- - public
- - management
- - storage
- - private
- - interface_properties:
- mtu:
- value:
- value: 9000
- ene9:
- - 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-fw-admin
- name: ene18
- - action: add-port
- bridge: br-ex
- name: ene25
- - action: add-port
- bridge: br-mgmt
- name: ene25.2011
- - action: add-port
- bridge: br-storage
- name: ene25.2010
- - action: add-port
- bridge: br-mesh
- name: ene25.2012
-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-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-ex
- name: ene10
- - action: add-port
- bridge: br-mgmt
- name: ene10.2011
- - action: add-port
- bridge: br-storage
- name: ene10.2010
- - action: add-port
- bridge: br-mesh
- name: ene10.2012
- - action: add-port
- bridge: br-fw-admin
- name: ene9
-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.2.101
- - 10.0.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:
- - 1000
- - 1030
- networks:
- - cidr: 10.0.2.0/24
- gateway: 10.0.2.254
- ip_ranges:
- - - 10.0.2.40
- - 10.0.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: 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: 2010
- - 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: 2011
- - 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: 2012
- - 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
-nodes:
-- id: 1
- role: controller,opendaylight
- interfaces: interfaces_2
- transformations: transformations_2
-- id: 2
- interfaces: interfaces_2
- role: ceph-osd,controller
- transformations: transformations_2
-- id: 3
- interfaces: interfaces_1
- role: controller,mongo
- transformations: transformations_1
-- id: 4
- interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
-- id: 5
- interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
-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=tty0 console=ttyS0,115200 console=ttyAMA0,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/pod2/fuel/config/dha.yaml b/labs/arm/pod2/fuel/config/dha.yaml
deleted file mode 100644
index 618efec..0000000
--- a/labs/arm/pod2/fuel/config/dha.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-dha-pod-config-metadata:
- title: Deployment Hardware Adapter (DHA)
- # DHA API version supported
- version: 1.1
- created: Sat Feb 4 15:47:15 2017
- comment: None
- comment: Enea Armband arm-pod2 DHA (mixed vendors)
-
-# 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: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 675
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:05:93
-- id: 2
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 674
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:05:96
-- id: 3
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 672
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 00:01:73:02:36:d5
-- id: 4
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 677
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 00:01:73:02:3b:1d
-- id: 5
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 676
- libvirtName: null
- libvirtTemplate: null
- pxeMac: 00:01:73:02:3b:41
-# Adding the Fuel node as node id 6
-# which may not be correct - please adjust as needed.
-- id: 6
- isFuel: true
- libvirtName: armband-pod2
- libvirtTemplate: templates/hardware_environment/vms/enea_lab/fuel.xml
- password: r00tme
- username: root
-disks:
- compute: 100G
- controller: 100G
- fuel: 100G
diff --git a/labs/arm/pod2/fuel/config/local_env b/labs/arm/pod2/fuel/config/local_env
deleted file mode 100644
index 831cdd6..0000000
--- a/labs/arm/pod2/fuel/config/local_env
+++ /dev/null
@@ -1,3 +0,0 @@
-export LIBVIRT_DEFAULT_URI=qemu+ssh://jenkins@10.0.2.5/system
-export DEFAULT_BRIDGE=admin_br0,public_br0
-export DEPLOY_TIMEOUT=360
diff --git a/labs/arm/pod3/fuel/config/dea-pod-override.yaml b/labs/arm/pod3/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 4453fb0..0000000
--- a/labs/arm/pod3/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,328 +0,0 @@
-dea-pod-override-config-metadata:
- title: 'DEA for Enea Armband lab'
- version: 1.1
- created: Tue Sep 6 11:52:02 2016
- comment: 'Armband specific'
- public_bridge: 'public7_br0'
-environment:
- name: armband_opnfv
- net_segment_type: tun
-wanted_release: Newton on Ubuntu 16.04 (aarch64)
-interfaces_1:
- ene11:
- - fuelweb_admin
- - interface_properties:
- mtu:
- value:
- value: 9000
- ene13:
- - public
- - management
- - storage
- - private
- - 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-fw-admin
- name: ene11
- - action: add-port
- bridge: br-ex
- name: ene13
- - action: add-port
- bridge: br-mgmt
- name: ene13.2183
- - action: add-port
- bridge: br-storage
- name: ene13.2184
- - action: add-port
- bridge: br-mesh
- name: ene13.2185
-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.8.254
- ipaddress: 10.0.8.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.8.101
- - 10.0.8.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.8.0/24
- gateway: 10.0.8.254
- ip_ranges:
- - - 10.0.8.41
- - 10.0.8.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: 2184
- - 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: 2183
- - 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: 2185
- - 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/pod3/fuel/config/dha.yaml b/labs/arm/pod3/fuel/config/dha.yaml
deleted file mode 100644
index 846b23b..0000000
--- a/labs/arm/pod3/fuel/config/dha.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-dha-pod-config-metadata:
- title: Deployment Hardware Adapter (DHA)
- # DHA API version supported
- version: 0.0.3
- created: Tue Sep 6 11:52:02 2016
- comment: Enea Armband arm-pod3 DHA (AMD Softiron)
-
-# 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: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 679
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:08:ae
-- id: 2
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 680
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:08:b1
-- id: 3
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 681
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:08:bd
-- id: 4
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 682
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:08:c6
-- id: 5
- ipmiIp: 10.0.2.6
- ipmiPass: admin
- ipmiUser: admin
- ipmiPort: 683
- libvirtName: null
- libvirtTemplate: null
- pxeMac: e0:ff:f7:00:08:cf
-# Adding the Fuel node as node id 6
-# which may not be correct - please adjust as needed.
-- id: 6
- isFuel: true
- libvirtName: armband-pod3
- libvirtTemplate: templates/hardware_environment/vms/enea_lab/fuel.xml
- password: r00tme
- username: root
-disks:
- compute: 100G
- controller: 100G
- fuel: 100G
diff --git a/labs/arm/pod3/fuel/config/local_env b/labs/arm/pod5/fuel/config/local_env
index 9c5cd34..9c5cd34 100644
--- a/labs/arm/pod3/fuel/config/local_env
+++ b/labs/arm/pod5/fuel/config/local_env