rollback

Author: gireg.roussel

Makefile

@@ -12,48 +12,48 @@ help:
 
 .PHONY: edge_model_serving ## 💁 Start model_serving service (Docker container)
 edge_model_serving:
-	docker compose up -d --build edge_model_serving
+	docker-compose up -d --build edge_model_serving
 
 .PHONY: edge_orchestrator ## 🕵 Start edge_orchestrator service (Docker container)
 edge_orchestrator:
-	docker compose up -d --build edge_orchestrator
+	docker-compose up -d --build edge_orchestrator
 
 .PHONY: edge_interface ## 📸 Start edge_interface inside a docker container
 edge_interface:
-	docker compose up -d --build edge_interface
+	docker-compose up -d --build edge_interface
 
 .PHONY: edge_db ## 📁 Start edge_db inside a docker container
 edge_db:
-	docker compose up -d --build edge_db
+	docker-compose up -d --build edge_db
 
 .PHONY: hub_monitoring ## ⚙️ Start hub_monitoring inside a docker container
 hub_monitoring:
-	docker compose up -d --build hub_monitoring
+	docker-compose up -d --build hub_monitoring
 
 .PHONY: hub_labelizer ## ⚙️ Start hub_labelizer inside a docker container
 hub_labelizer:
-	docker compose up -d --build hub_labelizer
+	docker-compose up -d --build hub_labelizer
 
 .PHONY: hub_monitoring_db ## ⚙️ Start hub_monitoring database inside a docker container
 hub_monitoring_db:
-	docker compose up -d --build hub_monitoring_db
+	docker-compose up -d --build hub_monitoring_db
 
 .PHONY: vio-hub-up ## 🐳 Start all hub services (monitoring, monitoring_db, labelizer)
 vio-hub-up:
-	docker compose --profile hub up -d --build
+	docker-compose --profile hub up -d --build
 
 .PHONY: vio-edge-up ## 🐳 Start all edge services (db, model_serving, orchestrator, interface)
 vio-edge-up:
-	docker compose --profile edge up -d --build
+	docker-compose --profile edge up -d --build
 
 .PHONY: vio-up ## 🐳 Start all edge services (db, model_serving, orchestrator, interface) and hubs (monitoring, monitoring_db, labelizer)
 vio-up:
-	docker compose --profile hub --profile edge up -d --build
+	docker-compose --profile hub --profile edge up -d --build
 
 .PHONY: vio-edge-up-raspberrypi ## 🐳 Start all edge services on RaspberryPI (db, model_serving, orchestrator, interface)
 vio-edge-up-raspberrypi:
-	docker compose -f docker-compose.raspberrypi.yml up -d --build
+	docker-compose -f docker-compose.raspberrypi.yml up -d --build
 
 .PHONY: vio-down ## ❌ Stop all services (model_serving, edge_orchestrator, ui)
 vio-down:
-	docker compose down
+	docker-compose down

deployment/edge/ansible/Makefile

@@ -19,8 +19,8 @@ deploy-vio-on-inventory:
 
 .PHONY: register-inventory-on-gcp-hub ## 🚀 Register the edge devices on the GCP hub
 register-inventory-on-gcp-hub:
-	ansible-playbook -v -i inventory.ini register_inventory_on_gcp_hub.yml -e ansible_python_interpreter=.venv/bin/python
+	ansible-playbook -v -i inventory.ini register_edge_on_gcp_hub.yml -e ansible_python_interpreter=.venv/bin/python
 
-.PHONY: test-register-localhost-on-gcp-hub ## 🚀 Test register localhost on the GCP hub
-test-register-localhost-on-gcp-hub:
-	ansible-playbook -v -c local -l localhost -i inventory.ini register_inventory_on_gcp_hub.yml -e ansible_python_interpreter=.venv/bin/python
+.PHONY: test-registering-localhost-on-gcp-hub ## 🚀 Test registering localhost on the GCP hub
+test-registering-localhost-on-gcp-hub:
+	ansible-playbook -v -c local -l localhost -i inventory.ini register_edge_on_gcp_hub.yml -e ansible_python_interpreter=.venv/bin/python

deployment/edge/ansible/README.md

@@ -2,30 +2,6 @@ Before launching ansible export a env to specify your local vio directory
 ```
 export LOCAL_VIO_DIR=
 ```
-### Setup the edge
-
-Install openssh-server on the edge:
-```bash
- sudo apt-get install openssh-server
-```
-
-Do not forget to install the google-cloud-storage package:
-```bash
-pip install google-cloud-storage==3.0.0
-```
-
-Then, try to connect through:
-```bash
- ssh localhost
-```
-
-Install Docker on the edge help you with [this link](https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository)
-Don't forget [post-installation](https://docs.docker.com/engine/install/linux-postinstall/) steps to run docker as a non-root user.
-
-Install *make* on the edge:
-```bash
-sudo apt-get install build-essential
-```
 
 
 ### Install sshpass and the requirements
@@ -49,7 +25,7 @@ ip a | grep -A 2 'wlx' | grep 'inet ' | awk '{print $2}' | cut -d/ -f1
 
 Then change the IP addresses on the inventory file
 
-## docker compose devices
+## docker-compose devices
 
 We are adding those devices to be able to trigger capture from 2 cameras connected on the usb port of your edge.
 

deployment/edge/ansible/register_edge_on_gcp_hub.yml

@@ -0,0 +1,17 @@
+- name: "Register edge on GCP hub"
+  hosts: all
+  tasks:
+    - name: Create edge_ip file
+      ansible.builtin.copy:
+        content: "{{ IP_ADDRESS }}"
+        dest: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/config/edge_ip.txt"
+
+    - name: Upload edge_ip file on GCP
+      google.cloud.gcp_storage_object:
+        action: upload
+        bucket: "{{ GCP_VIO_BUCKET }}"
+        dest: "{{ EDGE_NAME }}/edge_ip.txt"
+        src: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/config/edge_ip.txt"
+        project: "{{ GCP_VIO_PROJECT }}"
+        auth_kind: "serviceaccount"
+        service_account_file: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/config/secrets/credentials.json"

deployment/edge/ansible/register_inventory_on_gcp_hub.yml

@@ -1,4 +1,4 @@
-- name: "Register inventory on GCP hub"
+- name: "Register edge on GCP hub"
   hosts: all
   tasks:
     - name: Create edge_ip file

docs/index.md

@@ -42,7 +42,7 @@ In case you want to run a specific module, each module has its own make command:
 Indeed each of the above target correspond to a command [docker-compose.yml](https://github.com/octo-technology/VIO/blob/main/docker-compose.yml). For example, the target `edge_orchestrator` correspond to :
 
 ```shell
-$ docker compose up -d --build edge_orchestrator
+$ docker-compose up -d --build edge_orchestrator
 ```
 
 To check all services are up and running you can run the command `docker ps`, you should see something like below:

edge_orchestrator/README.md

@@ -25,8 +25,3 @@ MacOS:
 ```bash
 brew install postgresql
 ```
-MAC : 172.23.26.18
-ipconfig getifaddr en0
-
-Intel : 192.168.1.25
-ip a | grep -A 2 'wlx' | grep 'inet ' | awk '{print $2}' | cut -d/ -f1