Skip to content

Remove b2d worker. #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RomainMou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove b2d worker. #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/scripts/tag_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ img_list=(
pdf_preview_worker
office_preview_worker
pointcloud_worker
worker_b2d
elevation_worker
fragments_worker
)
Expand Down
6 changes: 0 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,6 @@ Object storage (S3):
| workers_pointcloud_cpu | 1 | Number of CPUs allocated for each replicas. |
| workers_pointcloud_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. |
| workers_pointcloud_task_timeout | "{{ '10h' | community.general.to_seconds | int }}" | Timeout for a pointcloud process. |
| workers_b2d_instance | 1 | Number of replicas deployed on *each* worker server. |
| workers_b2d_cpu | 1 | Number of CPUs allocated for each replicas. |
| workers_b2d_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. |
| workers_b2d_task_timeout | "{{ '30m' | community.general.to_seconds | int }}" | Timeout for a B2D process. |
| workers_elevation_instance | 1 | Number of replicas deployed on *each* worker server. |
| workers_elevation_cpu | 1 | Number of CPUs allocated for each replicas. |
| workers_elevation_ram | "{{ ansible_memtotal_mb / 2 }}m" | Quantity of RAM allocated for each replicas. |
Expand Down Expand Up @@ -466,8 +462,6 @@ with the [db] server on these ports.
| docker_workers_preview_office_tag | "{{ docker_bimdata_tag }}" | Worker preview Office tag. |
| docker_workers_dwg_image | "{{ docker_private_registry }}/on-premises/dwg_worker" | Worker DWG image. |
| docker_workers_dwg_tag | "{{ docker_bimdata_tag }}" | Worker DWG tag. |
| docker_workers_b2d_image | "{{ docker_private_registry }}/on-premises/worker_b2d" | Worker B2D image. |
| docker_workers_b2d_tag | "{{ docker_bimdata_tag }}" | Worker B2D tag. |
| docker_workers_elevation_image | "{{ docker_private_registry }}/on-premises/elevation_worker" | Worker Elevation image. |
| docker_workers_elevation_tag | "{{ docker_bimdata_tag }}" | Worker Elevation tag. |
| docker_workers_fragments_image | "{{ docker_private_registry }}/on-premises/fragments_worker" | Worker Fragments image. |
Expand Down
1 change: 0 additions & 1 deletion files/scripts/create_docker_offline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ worker_images=(
${src_private_repos}/pdf_preview_worker:${src_private_tag}
${src_private_repos}/office_preview_worker:${src_private_tag}
${src_private_repos}/pointcloud_worker:${src_private_tag}
${src_private_repos}/worker_b2d:${src_private_tag}
${src_private_repos}/elevation_worker:${src_private_tag}
${src_private_repos}/fragments_worker:${src_private_tag}
)
Expand Down
1 change: 0 additions & 1 deletion files/scripts/retag_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ img_list=(
pdf_preview_worker
office_preview_worker
pointcloud_worker
worker_b2d
elevation_worker
fragments_worker
)
Expand Down
6 changes: 0 additions & 6 deletions roles/prepare_vars/defaults/main/applications.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@ workers_pointcloud_cpu: 1
workers_pointcloud_ram: "{{ ansible_memtotal_mb / 2 }}m"
workers_pointcloud_task_timeout: "{{ '10h' | community.general.to_seconds | int }}"

## b2d
workers_b2d_instance: 1
workers_b2d_cpu: 1
workers_b2d_ram: "{{ ansible_memtotal_mb / 2 }}m"
workers_b2d_task_timeout: "{{ '30m' | community.general.to_seconds | int }}"

## elevation
workers_elevation_instance: 1
workers_elevation_cpu: 1
Expand Down
3 changes: 0 additions & 3 deletions roles/prepare_vars/defaults/main/docker_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ docker_workers_dwg_tag: "{{ docker_bimdata_tag }}"
docker_workers_pointcloud_image: "{{ docker_private_registry }}/on-premises/pointcloud_worker"
docker_workers_pointcloud_tag: "{{ docker_bimdata_tag }}"

docker_workers_b2d_image: "{{ docker_private_registry }}/on-premises/worker_b2d"
docker_workers_b2d_tag: "{{ docker_bimdata_tag }}"

docker_workers_elevation_image: "{{ docker_private_registry }}/on-premises/elevation_worker"
docker_workers_elevation_tag: "{{ docker_bimdata_tag }}"

Expand Down
27 changes: 0 additions & 27 deletions roles/prepare_vars/templates/compose_workers.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,33 +392,6 @@ workers-pointcloud:
extra_hosts: {{ docker_extra_hosts | to_yaml }}
{% endif %}

workers-b2d:
image: {{ docker_workers_b2d_image }}:{{ docker_workers_b2d_tag }}
deploy:
replicas: {{ workers_b2d_instance }}
resources:
limits:
cpus: "{{ workers_b2d_cpu }}"
memory: "{{ workers_b2d_ram }}"
environment:
- RABBITMQ_HOST={{ rabbitmq_host }}
- RABBITMQ_PORT={{ rabbitmq_port }}
- RABBITMQ_USER={{ rabbitmq_user }}
- RABBITMQ_PASSWORD={{ rabbitmq_password }}
- API_URL={{ urls['api'] }}
- ENV={{ app_env }}
- MASTER_TOKEN={{ master_token }}
- TIMEOUT={{ workers_b2d_task_timeout }}
{% if tls_custom_ca | bool %}
- CA_CERT=/opt/onprem-ca.crt
volumes:
- {{ bimdata_docker_volume_path }}/ca.crt:/opt/onprem-ca.crt:ro
{% endif %}
restart: unless-stopped
{% if docker_use_extra_hosts | bool %}
extra_hosts: {{ docker_extra_hosts | to_yaml }}
{% endif %}

workers-elevation:
image: {{ docker_workers_elevation_image }}:{{ docker_workers_elevation_tag }}
deploy:
Expand Down