AT5-382: Changed namefor th tangodb volume. (488ffd4b) · Commits · Gianluca Marotta / csp-lmc-old

csp-lmc-common/docker/config/csplmc_dsconfig.json

+33 −16

Original line number	Diff line number	Diff line
		@@ -91,22 +91,17 @@
		},
		"searchBeamAddresses": {
		"__root_att": [
		"common/elt/search_beams_monitor/cspCapabilityAddresses"
		"common/elt/search_beams_monitor/capabilityAddresses"
		]
		},
		"timingBeamAddresses": {
		"__root_att": [
		"common/elt/timing_beams_monitor/cspCapabilityAddresses"
		"common/elt/timing_beams_monitor/capabilityAddresses"
		]
		},
		"vlbiBeamAddresses": {
		"__root_att": [
		"common/elt/vlbi_beams_monitor/cspCapabilityAddresses"
		]
		},
		"reservedSearchBeamIDs": {
		"__root_att": [
		"common/elt/search_beams_monitor/reservedIDs"
		"common/elt/vlbi_beams_monitor/capabilityAddresses"
		]
		},
		"unassignedSearchBeamIDs": {
		@@ -124,17 +119,17 @@
		"common/elt/vlbi_beams_monitor/unassignedIDs"
		]
		},
		"unassignedSearchBeamNum": {
		"numOfUnassignedSearchBeams": {
		"__root_att": [
		"common/elt/search_beams_monitor/numOfUnassignedIDs"
		]
		},
		"unassignedTimingBeamNum": {
		"numOfUnassignedTimingBeams": {
		"__root_att": [
		"common/elt/timing_beams_monitor/numOfUnassignedIDs"
		]
		},
		"unassignedVlbiBeamNum": {
		"numOfUnassignedVlbiBeams": {
		"__root_att": [
		"common/elt/vlbi_beams_monitor/numOfUnassignedIDs"
		]
		@@ -205,8 +200,24 @@
		"1000",
		"pstadminmode",
		"1000",
		"commandprogress",
		"3000",
		"oncommandprogress",
		"2000",
		"offcommandprogress",
		"2000",
		"standbycommandprogress",
		"2000",
		"oncmdtimeoutexpired",
		"1000",
		"offcmdtimeoutexpired",
		"1000",
		"standbycmdtimeoutexpired",
		"1000",
		"oncmdfailure",
		"1000",
		"offcmdfailure",
		"1000",
		"standbycmdfailure",
		"1000",
		"cspcbfhealthstate",
		"1000",
		"csppsshealthstate",
		@@ -228,7 +239,7 @@
		"1"
		],
		"__value": [
		"0"
		"3"
		]
		},
		"healthState": {
		@@ -362,6 +373,9 @@
		"abs_change": [
		"-1",
		"1"
		],
		"__value": [
		"0"
		]
		},
		"healthState": {
		@@ -419,6 +433,9 @@
		"abs_change": [
		"-1",
		"1"
		],
		"__value": [
		"0"
		]
		},
		"healthState": {

csp-lmc-common/docker/csp-lmc.yml

+16 −15

Original line number	Diff line number	Diff line
		@@ -123,20 +123,21 @@ services:
		volumes_from:
		- rsyslog-csplmc:rw

		pssmaster:
		image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/csp-lmc-common:latest
		network_mode: ${NETWORK_MODE}
		container_name: ${CONTAINER_NAME_PREFIX}pssmaster
		depends_on:
		- csp_dsconfig
		- rsyslog-csplmc
		environment:
		- TANGO_HOST=${TANGO_HOST}
		command: >
		sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
		/venv/bin/python /app/simulators/DeviceTestMaster/PssMasterSimulator.py pss"
		volumes_from:
		- rsyslog-csplmc:rw
		# Re-enable next lines to test CSP.LMC with PSS Master simulator
		# pssmaster:
		# image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/csp-lmc-common:latest
		# network_mode: ${NETWORK_MODE}
		# container_name: ${CONTAINER_NAME_PREFIX}pssmaster
		# depends_on:
		# - csp_dsconfig
		# - rsyslog-csplmc
		# environment:
		# - TANGO_HOST=${TANGO_HOST}
		# command: >
		# sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
		# /venv/bin/python /app/simulators/DeviceTestMaster/PssMasterSimulator.py pss"
		# volumes_from:
		# - rsyslog-csplmc:rw

		rsyslog-csplmc:
		image: jumanjiman/rsyslog

csp-lmc-common/docker/csp-tangodb.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		#
		version: '2.2'
		volumes:
		tangodb: {}
		common-tangodb: {}

		services:
		tangodb:
		@@ -23,7 +23,7 @@ services:
		- MYSQL_USER=tango
		- MYSQL_PASSWORD=tango
		volumes:
		- tangodb:/var/lib/mysql
		- common-tangodb:/var/lib/mysql

		databaseds:
		image: nexus.engageska-portugal.pt/ska-docker/tango-cpp:latest