diff --git a/.github/scripts/tag_images.sh b/.github/scripts/tag_images.sh index 8c55a4d..0f04aa5 100755 --- a/.github/scripts/tag_images.sh +++ b/.github/scripts/tag_images.sh @@ -30,7 +30,6 @@ img_list=( pdf_preview_worker office_preview_worker pointcloud_worker - worker_b2d elevation_worker fragments_worker ) diff --git a/README.md b/README.md index 1ec1443..45baa7d 100644 --- a/README.md +++ b/README.md @@ -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. | @@ -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. | diff --git a/files/scripts/create_docker_offline.sh b/files/scripts/create_docker_offline.sh index 7974d43..79312c8 100755 --- a/files/scripts/create_docker_offline.sh +++ b/files/scripts/create_docker_offline.sh @@ -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} ) diff --git a/files/scripts/retag_images.sh b/files/scripts/retag_images.sh index f63f973..8967ef1 100755 --- a/files/scripts/retag_images.sh +++ b/files/scripts/retag_images.sh @@ -28,7 +28,6 @@ img_list=( pdf_preview_worker office_preview_worker pointcloud_worker - worker_b2d elevation_worker fragments_worker ) diff --git a/roles/prepare_vars/defaults/main/applications.yml b/roles/prepare_vars/defaults/main/applications.yml index c93cfa0..850550c 100644 --- a/roles/prepare_vars/defaults/main/applications.yml +++ b/roles/prepare_vars/defaults/main/applications.yml @@ -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 diff --git a/roles/prepare_vars/defaults/main/docker_images.yml b/roles/prepare_vars/defaults/main/docker_images.yml index a3a1090..c77fcd3 100644 --- a/roles/prepare_vars/defaults/main/docker_images.yml +++ b/roles/prepare_vars/defaults/main/docker_images.yml @@ -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 }}" diff --git a/roles/prepare_vars/templates/compose_workers.yml.j2 b/roles/prepare_vars/templates/compose_workers.yml.j2 index 3ee3ecb..b2c5fea 100644 --- a/roles/prepare_vars/templates/compose_workers.yml.j2 +++ b/roles/prepare_vars/templates/compose_workers.yml.j2 @@ -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: