robocars/robocar-setup
1
0
Fork 0
Code Issues 15 Pull Requests Projects 1 Releases Wiki Activity

[microservices] Fix variables syntaxe

Browse Source
This commit is contained in:
Cyrille Nofficial 2020-02-10 22:12:44 +01:00
parent cd6e57bf7d
commit f74c801a64
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ansible/roles/microservices/files/docker-compose.yaml
View File

@ -37,10 +37,10 @@ services:
MQTT_USERNAME: "${MQTT_USERNAME}" MQTT_USERNAME: "${MQTT_USERNAME}"
MQTT_PASSWORD: "${MQTT_PASSWORD}" MQTT_PASSWORD: "${MQTT_PASSWORD}"
MQTT_CLIENT_ID: rc-arduino MQTT_CLIENT_ID: rc-arduino
MQTT_TOPIC_THROTTLE: "${{ MQTT_TOPIC_RC_THROTTLE }}" MQTT_TOPIC_THROTTLE: "${MQTT_TOPIC_RC_THROTTLE}"
MQTT_TOPIC_STEERING: "${{ MQTT_TOPIC_RC_STEERING }}" MQTT_TOPIC_STEERING: "${MQTT_TOPIC_RC_STEERING}"
MQTT_TOPIC_DRIVE_MODE: "${{ MQTT_TOPIC_RC_DRIVE_MODE }}" MQTT_TOPIC_DRIVE_MODE: "${MQTT_TOPIC_RC_DRIVE_MODE}"
MQTT_TOPIC_SWITCH_RECORD: "${{ MQTT_TOPIC_RC_SWITCH_RECORD }}" MQTT_TOPIC_SWITCH_RECORD: "${MQTT_TOPIC_RC_SWITCH_RECORD}"
MQTT_QOS: "0" MQTT_QOS: "0"
TZ: "Europe/Paris" TZ: "Europe/Paris"
@ -83,8 +83,8 @@ services:
MQTT_USERNAME: "${MQTT_USERNAME}" MQTT_USERNAME: "${MQTT_USERNAME}"
MQTT_PASSWORD: "${MQTT_PASSWORD}" MQTT_PASSWORD: "${MQTT_PASSWORD}"
MQTT_CLIENT_ID: rc-pca9685 MQTT_CLIENT_ID: rc-pca9685
MQTT_TOPIC_THROTTLE: "${{ MQTT_TOPIC_THROTTLE }}" MQTT_TOPIC_THROTTLE: "${MQTT_TOPIC_THROTTLE}"
MQTT_TOPIC_STEERING: "${{ MQTT_TOPIC_STEERING }}" MQTT_TOPIC_STEERING: "${MQTT_TOPIC_STEERING}"
MQTT_QOS: "0" MQTT_QOS: "0"
TZ: "Europe/Paris" TZ: "Europe/Paris"
@ -96,7 +96,7 @@ services:
volumes: volumes:
- /home/pi/models/steering:/model - /home/pi/models/steering:/model
environment: environment:
MQTT_BROKER: "${MQTT_BROKER}" MQTT_BROKER: "${MQTT_BROKER_HOST}"
MQTT_USERNAME: "${MQTT_USERNAME}" MQTT_USERNAME: "${MQTT_USERNAME}"
MQTT_PASSWORD: "${MQTT_PASSWORD}" MQTT_PASSWORD: "${MQTT_PASSWORD}"
MQTT_CLIENT_ID: rc-tflite-steering MQTT_CLIENT_ID: rc-tflite-steering
@ -107,7 +107,8 @@ services:
steering: steering:
image: cyrilix/robocar-steering image: cyrilix/robocar-steering
command: "" command:
- "-mqtt-retain=false"
user: "1234:1234" user: "1234:1234"
network_mode: host network_mode: host
environment: environment:
@ -134,7 +135,7 @@ services:
MQTT_PASSWORD: "${MQTT_PASSWORD}" MQTT_PASSWORD: "${MQTT_PASSWORD}"
MQTT_CLIENT_ID: rc-throttle MQTT_CLIENT_ID: rc-throttle
MQTT_TOPIC_THROTTLE: "${MQTT_TOPIC_THROTTLE}" MQTT_TOPIC_THROTTLE: "${MQTT_TOPIC_THROTTLE}"
MQTT_TOPIC_RC_THROTTLE: "${{ MQTT_TOPIC_RC_THROTTLE }}" MQTT_TOPIC_RC_THROTTLE: "${MQTT_TOPIC_RC_THROTTLE}"
MQTT_TOPIC_DRIVE_MODE: "${MQTT_TOPIC_RC_DRIVE_MODE}" MQTT_TOPIC_DRIVE_MODE: "${MQTT_TOPIC_RC_DRIVE_MODE}"
THROTTLE_MIN: "0.3" THROTTLE_MIN: "0.3"
THROTTLE_MAX: "0.4" THROTTLE_MAX: "0.4"
@ -191,6 +192,7 @@ services:
MQTT_CLIENT_ID: rc-record MQTT_CLIENT_ID: rc-record
MQTT_TOPIC_CAMERA: "${MQTT_TOPIC_CAMERA}" MQTT_TOPIC_CAMERA: "${MQTT_TOPIC_CAMERA}"
MQTT_TOPIC_STEERING: "${MQTT_TOPIC_RC_STEERING}" MQTT_TOPIC_STEERING: "${MQTT_TOPIC_RC_STEERING}"
MQTT_TOPIC_SWITCH_RECORD: "${MQTT_TOPIC_RC_SWITCH_RECORD" MQTT_TOPIC_SWITCH_RECORD: "${MQTT_TOPIC_RC_SWITCH_RECORD}"
MQTT_TOPIC_RECORDS: "${MQTT_TOPIC_RECORDS}"
MQTT_QOS: "0" MQTT_QOS: "0"
TZ: "Europe/Paris" TZ: "Europe/Paris"

24
ansible/roles/microservices/templates/env
View File

@ -1,21 +1,25 @@
# Broker configuration # Broker configuration
MQTT_BROKER_HOST=localhost
MQTT_BROKER=tcp://localhost:1883 MQTT_BROKER=tcp://localhost:1883
MQTT_USERNAME="{{ rabbitmq_user }}" MQTT_USERNAME={{ rabbitmq_user }}
MQTT_PASSWORD="{{ rabbitmq_password }}" MQTT_PASSWORD={{ rabbitmq_password }}
# Camera # Camera
MQTT_TOPIC_CAMERA="car/satanas/part/camera" MQTT_TOPIC_CAMERA=car/satanas/part/camera
# Radio command # Radio command
MQTT_TOPIC_RC_THROTTLE: car/satanas/part/rc/throttle MQTT_TOPIC_RC_THROTTLE=car/satanas/part/rc/throttle
MQTT_TOPIC_RC_STEERING: car/satanas/part/rc/steering MQTT_TOPIC_RC_STEERING=car/satanas/part/rc/steering
MQTT_TOPIC_RC_SWITCH_RECORD: car/satanas/part/rc/switch_record MQTT_TOPIC_RC_SWITCH_RECORD=car/satanas/part/rc/switch_record
MQTT_TOPIC_RC_DRIVE_MODE: car/satanas/part/rc/drive_mode MQTT_TOPIC_RC_DRIVE_MODE=car/satanas/part/rc/drive_mode
MQTT_TOPIC_TF_STEERING: car/satanas/part/tflite/steering MQTT_TOPIC_TF_STEERING=car/satanas/part/tflite/steering
# Values to apply # Values to apply
MQTT_TOPIC_THROTTLE: car/satanas/part/throttle MQTT_TOPIC_THROTTLE=car/satanas/part/throttle
MQTT_TOPIC_STEERING: car/satanas/part/steering MQTT_TOPIC_STEERING=car/satanas/part/steering
# Records topic
MQTT_TOPIC_RECORDS=car/satanas/part/records