Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Fix initialization script in users notebook to enable users to build topics from the jupyter server. Fix EFD compose file to deploy database in private network.
  Adds compose files for jupyter notebooks and a compose file for CSCs to be launched at the summit network.
  Adds EFD setup files, ATDome and ATHexapod.
  • Loading branch information
tribeiro committed Jul 18, 2019
2 parents 8b70d15 + ec8a06c commit 8370f18
Show file tree
Hide file tree
Showing 20 changed files with 444 additions and 44 deletions.
32 changes: 32 additions & 0 deletions AT_CSC/ATDome/ATDome.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
$schema: http://json-schema.org/draft-07/schema#
$id: https://github.com/lsst-ts/ts_ATDome/blob/master/schema/ATDome.yaml
# title must end with one or more spaces followed by the schema version, which must begin with "v"
title: ATDome v1
description: Schema for ATDome configuration files
type: object
properties:
host:
description: IP address of the TCP/IP interface
type: string
format: hostname
default: "192.168.1.46"
port:
description: Port number of the TCP/IP interface
type: integer
default: 17310
connection_timeout:
description: Time limit for connecting to the TCP/IP interface (sec)
type: number
exclusiveMinimum: 0
default: 10
read_timeout:
description: Time limit for reading data from the TCP/IP interface (sec)
type: number
exclusiveMinimum: 0
default: 10
required:
- host
- port
- connection_timeout
- read_timeout
additionalProperties: false
11 changes: 10 additions & 1 deletion AT_CSC/ATPTG/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ services:
environment:
- OSPL_URI=${OSPL_URI}
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
network_mode: "host"
networks:
control-network:
ipv4_address: "192.168.1.203"
volumes:
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}

networks:
default:
external:
name: control-network
control-network:
external: true
5 changes: 4 additions & 1 deletion AT_CSC/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Compose files for CSCs that talk to real hardware. No simmmulators!

Compose files for CSCs that talk to real hardware. No simmulators!

Use the compose file in this directory to launch all the CSCs.
59 changes: 59 additions & 0 deletions AT_CSC/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
version: '3.6'

services:

atptg:
image: tiagorib/ptkernel:rc0.5_sal3.9
container_name: atptg
environment:
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
networks:
control-network:
ipv4_address: "192.168.1.211"

atdome-csc:
image: lsstts/at_dome:3.9-0.5
container_name: atdome
environment:
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
networks:
control-network:
ipv4_address: "192.168.1.212"

atdometrajectory-sim:
image: lsstts/at_dome_trajectory_sim:3.9-0.6a
container_name: atdometrajectory
environment:
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
networks:
control-network:
ipv4_address: "192.168.1.213"

HexapodCSC:
image: lsstts/ts_athexapod:3.9-dm-19762
container_name: athexapod
environment:
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
networks:
control-network:
ipv4_address: "192.168.1.214"
volumes:
- ./ATHexapod/startCSC.sh:/home/saluser/startCSC.sh
- ./ATHexapod/tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
entrypoint: ["/home/saluser/startCSC.sh"]

ataos:
image: lsstts/ataos:DM-19890
container_name: ataos
environment:
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
networks:
control-network:
ipv4_address: "192.168.1.215"

networks:
default:
external:
name: control-network
control-network:
external: true
24 changes: 24 additions & 0 deletions AT_EFD/dimm_command_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Source this file when starting the container to set it up

echo "#"
echo "# Loading LSST Stack"
source /opt/lsst/software/stack/loadLSST.bash
setup lsst_distrib
echo "#"
echo "# Loading sal environment"
source repos/ts_sal/setup.env
echo "#"
echo "# Setting up sal, salobj and scriptqueue"

setup ts_xml -t current
setup ts_sal -t current
setup ts_salobj -t current
setup ts_scriptqueue -t current

~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &

/bin/bash --rcfile /home/saluser/.bash_rc
24 changes: 24 additions & 0 deletions AT_EFD/dimm_event_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Source this file when starting the container to set it up

echo "#"
echo "# Loading LSST Stack"
source /opt/lsst/software/stack/loadLSST.bash
setup lsst_distrib
echo "#"
echo "# Loading sal environment"
source repos/ts_sal/setup.env
echo "#"
echo "# Setting up sal, salobj and scriptqueue"

setup ts_xml -t current
setup ts_sal -t current
setup ts_salobj -t current
setup ts_scriptqueue -t current

#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &

/bin/bash --rcfile /home/saluser/.bash_rc
24 changes: 24 additions & 0 deletions AT_EFD/dimm_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Source this file when starting the container to set it up

echo "#"
echo "# Loading LSST Stack"
source /opt/lsst/software/stack/loadLSST.bash
setup lsst_distrib
echo "#"
echo "# Loading sal environment"
source repos/ts_sal/setup.env
echo "#"
echo "# Setting up sal, salobj and scriptqueue"

setup ts_xml -t current
setup ts_sal -t current
setup ts_salobj -t current
setup ts_scriptqueue -t current

#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &

/bin/bash --rcfile /home/saluser/.bash_rc
24 changes: 24 additions & 0 deletions AT_EFD/dimm_telemetry_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Source this file when starting the container to set it up

echo "#"
echo "# Loading LSST Stack"
source /opt/lsst/software/stack/loadLSST.bash
setup lsst_distrib
echo "#"
echo "# Loading sal environment"
source repos/ts_sal/setup.env
echo "#"
echo "# Setting up sal, salobj and scriptqueue"

setup ts_xml -t current
setup ts_sal -t current
setup ts_salobj -t current
setup ts_scriptqueue -t current

#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter

/bin/bash --rcfile /home/saluser/.bash_rc
Loading

0 comments on commit 8370f18

Please sign in to comment.