Skip to content
Snippets Groups Projects
Commit f32b516c authored by Hannes Feldt's avatar Hannes Feldt
Browse files

Merge branch 'L2SS-1341-migrate_tango2nomad' into L2SS-1340-deploy_monitoring_to_nomad

parents 5eabd416 03087c43
No related branches found
No related tags found
4 merge requests!752Resolve L2SS-1525 "Migrate minio",!751Resolve L2SS-1340 "Deploy monitoring to nomad",!749Resolve L2SS-1342 "Migrate jupyter",!685Resolve L2SS-1340 "Deploy monitoring to nomad"
Showing
with 504 additions and 359 deletions
......@@ -247,7 +247,6 @@ integration_test_docker:
dependencies:
- wheel_packaging
tags:
- privileged
- integration_tests
services:
- name: docker:dind
......
......@@ -22,8 +22,7 @@
"STAT/Configuration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Calibration/1",
"STAT/Boot/1"
"STAT/Calibration/1"
],
"Control_Children": [
......@@ -36,7 +35,6 @@
"STAT/TemperatureManager/1",
"STAT/Calibration/1",
"STAT/Configuration/1",
"STAT/Boot/1",
"STAT/RECVL/1"
]
}
......@@ -44,14 +42,6 @@
}
}
},
"Boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
}
}
}
},
"CCD": {
"STAT": {
"CCD": {
......
This diff is collapsed.
......@@ -11,7 +11,6 @@
"STAT/Calibration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1",
"STAT/AntennaField/LBA",
"STAT/AntennaField/HBA"
],
......@@ -24,7 +23,6 @@
"STAT/Calibration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1",
"STAT/AntennaField/LBA",
"STAT/AntennaField/HBA",
"STAT/APS/L0",
......@@ -70,50 +68,6 @@
}
}
},
"boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
"Device_Names": [
"STAT/Configuration/1",
"STAT/PSOC/1",
"STAT/PCON/1",
"STAT/APSPU/L0",
"STAT/APSCT/L0",
"STAT/RECVL/L0",
"STAT/UNB2/L0",
"STAT/APSPU/L1",
"STAT/APSCT/L1",
"STAT/RECVL/L1",
"STAT/UNB2/L1",
"STAT/APSPU/H0",
"STAT/APSCT/H0",
"STAT/RECVH/H0",
"STAT/UNB2/H0",
"STAT/CCD/1",
"STAT/SDP/HBA",
"STAT/BST/HBA",
"STAT/SST/HBA",
"STAT/XST/HBA",
"STAT/Beamlet/HBA",
"STAT/AntennaField/HBA",
"STAT/TileBeam/HBA",
"STAT/DigitalBeam/HBA",
"STAT/SDP/LBA",
"STAT/BST/LBA",
"STAT/SST/LBA",
"STAT/XST/LBA",
"STAT/Beamlet/LBA",
"STAT/AntennaField/LBA",
"STAT/DigitalBeam/LBA",
"STAT/TemperatureManager/1"
]
}
}
}
}
},
"CCD": {
"STAT": {
"CCD": {
......
......@@ -16,19 +16,6 @@
}
}
},
"boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
"Initialise_Hardware": [
"True"
]
}
}
}
}
},
"Beamlet": {
"STAT": {
"Beamlet": {
......
......@@ -21,7 +21,6 @@ These are the required changes that need to be made in order to support multiple
##### In the config file:
- add all the new devices under the "STAT/DEVICE/2" name with the correct IP addresses, ports and other properties. This includes: APSCT, APSPU, RECV and UNB2.
- Put the new devices in the "Device_Names" list for the boot devices
- Set the first 8 bools in "STAT/SDPFirmware/1" ... "TR_fpga_mask_RW_default" to True (instead of the first 4 with 1 subrack). This enables the new FPGA's
##### In the jupyter startup script
......
......@@ -10,8 +10,7 @@
"STAT/Configuration/1",
"STAT/Calibration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1"
"STAT/TemperatureManager/1"
],
"Control_Children": [
"STAT/CCD/1",
......@@ -20,24 +19,13 @@
"STAT/Configuration/1",
"STAT/Calibration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1"
"STAT/TemperatureManager/1"
]
}
}
}
}
},
"boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
}
}
}
}
},
"Calibration": {
"STAT": {
"Calibration": {
......@@ -196,16 +184,6 @@
}
}
}
},
"Boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
}
}
}
}
}
}
}
......@@ -8,7 +8,6 @@
"Power_Children": [
"STAT/EC/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1",
"STAT/AntennaField/LBA",
"STAT/AntennaField/HBA0",
"STAT/AntennaField/HBA1",
......@@ -25,7 +24,6 @@
"STAT/Calibration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Boot/1",
"STAT/APS/L0",
"STAT/APS/L1",
"STAT/APS/H0",
......@@ -72,58 +70,6 @@
}
}
},
"boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
"Device_Names": [
"STAT/Configuration/1",
"STAT/PSOC/1",
"STAT/PCON/1",
"STAT/APSPU/L0",
"STAT/APSCT/L0",
"STAT/RECVL/L0",
"STAT/UNB2/L0",
"STAT/APSPU/L1",
"STAT/APSCT/L1",
"STAT/RECVL/L1",
"STAT/UNB2/L1",
"STAT/APSPU/H0",
"STAT/APSCT/H0",
"STAT/RECVH/H0",
"STAT/UNB2/H0",
"STAT/CCD/1",
"STAT/SDP/LBA",
"STAT/BST/LBA",
"STAT/SST/LBA",
"STAT/XST/LBA",
"STAT/Beamlet/LBA",
"STAT/AntennaField/LBA",
"STAT/DigitalBeam/LBA",
"STAT/SDP/HBA0",
"STAT/BST/HBA0",
"STAT/SST/HBA0",
"STAT/XST/HBA0",
"STAT/Beamlet/HBA0",
"STAT/AntennaField/HBA0",
"STAT/TileBeam/HBA0",
"STAT/DigitalBeam/HBA0",
"STAT/SDP/HBA1",
"STAT/BST/HBA1",
"STAT/SST/HBA1",
"STAT/XST/HBA1",
"STAT/Beamlet/HBA1",
"STAT/AntennaField/HBA1",
"STAT/TileBeam/HBA1",
"STAT/DigitalBeam/HBA1",
"STAT/TemperatureManager/1"
]
}
}
}
}
},
"EC": {
"STAT": {
"EC": {
......
......@@ -169,6 +169,32 @@
"5", "5", "3", "13", "10", "3",
"12", "2", "7", "15", "6", "14",
"7", "5", "7", "9", "0", "15"
],
"Frequency_Band_RW_default": [
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190"
]
}
},
......@@ -194,6 +220,32 @@
"5", "5", "3", "13", "10", "3",
"12", "2", "7", "15", "6", "14",
"7", "5", "7", "9", "0", "15"
],
"Frequency_Band_RW_default": [
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190"
]
}
}
......
......@@ -110,6 +110,56 @@
"8", "2", "12", "13", "9", "13",
"4", "5", "5", "12", "5", "5",
"9", "11", "15", "12", "2", "15"
],
"Frequency_Band_RW_default": [
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190",
"HBA_110_190", "HBA_110_190"
]
}
}
......
......@@ -89,6 +89,104 @@
],
"Antenna_Type": [
"LBA"
],
"Frequency_Band_RW_default": [
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90",
"LBA_10_90", "LBA_10_90"
]
}
}
......
{
"servers": {
"Boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
"Initialise_Hardware": [
"False"
]
}
}
}
}
},
"APSCT": {
"STAT": {
"APSCT": {
......
{
"servers": {
"Boot": {
"STAT": {
"Boot": {
"STAT/Boot/1": {
"properties": {
"Initialise_Hardware": [
"False"
]
}
}
}
}
},
"APSCT": {
"STAT": {
"APSCT": {
......
......@@ -135,6 +135,7 @@ Next change the version in the following places:
# Release Notes
* 0.22.0 Migrate execution environment to nomad
* 0.21.2 Removed deprecated "Boot" device (use StationManager now)
* 0.21.1 Implement multi project integration downstream pipeline
* 0.21.0 Use radians instead of degrees when interpreting pointings
* 0.20.5 Manage both polarisations in RCU_band_select_R(W), Antenna_Loss_R, and Frequency_Band_RW
......
# Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
# SPDX-License-Identifier: Apache-2.0
#
# Docker compose file that launches a LOFAR2.0 station's
# ObservationControl device. It also runs the dynamically
# created Observation devices.
#
# Defines:
# - device-observation-control: LOFAR2.0 station ObvservationControl
#
# Requires:
# - lofar-device-base.yml
#
version: '2.1'
services:
device-boot:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base:${TAG}
hostname: device-boot
container_name: device-boot
logging:
driver: "json-file"
options:
max-size: "100m"
max-file: "10"
networks:
- control
dns: ${DNS}
ports:
- "5708:5708" # unique port for this DS
- "5808:5808" # ZeroMQ event port
- "5908:5908" # ZeroMQ heartbeat port
extra_hosts:
- "host.docker.internal:host-gateway"
volumes:
- ..:/opt/lofar/tango:rw
environment:
- TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5808
- TANGO_ZMQ_HEARTBEAT_PORT=5908
healthcheck:
test: l2ss-health dserver/BOOT/STAT
interval: 1m
timeout: 30s
retries: 3
start_period: 30s
working_dir: /opt/lofar/tango
entrypoint:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- l2ss-boot Boot STAT -v -ORBendPoint giop:tcp:0:5708 -ORBendPointPublish giop:tcp:${HOSTNAME}:5708
restart: on-failure
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -70,7 +70,6 @@ tilebeam_h1 = OptionalDeviceProxy("STAT/TileBeam/HBA1")
antennafield_h1 = OptionalDeviceProxy("STAT/AntennaField/HBA1")
stationmanager = OptionalDeviceProxy("STAT/StationManager/1")
boot = OptionalDeviceProxy("STAT/Boot/1")
ccd = OptionalDeviceProxy("STAT/CCD/1")
ec = OptionalDeviceProxy("STAT/EC/1")
pcon = OptionalDeviceProxy("STAT/PCON/1")
......@@ -83,7 +82,6 @@ configuration = OptionalDeviceProxy("STAT/Configuration/1")
devices = (
[
stationmanager,
boot,
ccd,
ec,
pcon,
......
......@@ -47,7 +47,9 @@ services:
done
mc alias set object-storage http://object-storage:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD
mc mb --with-versioning object-storage/caltables
mc cp --recursive /opt/lofar/tango/docker-compose/object-storage/caltables/ object-storage/caltables/"
mc cp --recursive /opt/lofar/tango/docker-compose/object-storage/caltables/ object-storage/caltables/
date +'%F %T'
echo 'Initialisation completed'"
volumes:
object-storage:
......@@ -18,8 +18,6 @@
},
"stat/beamlet/*": {
},
"stat/boot/1": {
},
"stat/stationmanager/1": {
},
"stat/digitalbeam/*": {
......
......@@ -46,8 +46,6 @@
"FPGA_bf_weights_*"
]
},
"stat/boot/1": {
},
"stat/bst/*": {
"exclude": [
"bst_R",
......
......@@ -26,8 +26,6 @@
},
"stat/beamlet/*": {
},
"stat/boot/1": {
},
"stat/stationmanager/1": {
},
"stat/digitalbeam/*": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment