DEV-700 pmci: bugfix for elastic search feature

group_vars/connect/plain.yml

@@ -11,7 +11,6 @@ connect_postgres_database: "{{ stage }}_{{ tenant_id }}_{{ cluster_name }}_conne
 connect_postgres_username: "{{ connect_postgres_database }}"
 connect_postgres_password: "connect-postgres-admin"
 
-#connect_process_search_module: "external"
 connect_elastic_host: "{{ shared_service_elastic_stack_01_hostname }}"
 connect_elastic_username: "{{ elastic_admin_username }}"
 connect_elastic_password: "{{ elastic_admin_password }}"

group_vars/connect_search_elastic/main.yml

@@ -0,0 +1,3 @@
+---
+
+connect_search_elastic_enabled: "true"

group_vars/management/plain.yml

@@ -5,11 +5,15 @@ hetzner_server_type: cx21
 connect_client_admin_username: "{{ management_admin_username }}"
 connect_client_admin_password: "{{ management_admin_password }}"
 connect_workflow_env: "stage:{{ stage }};smardigoUserToken:{{ smardigo_auth_token_value }}"
-connect_process_search_module: "external"
 connect_oidc_client_secret: "{{ management_oidc_client_secret }}"
-connect_external_task_script_worker_enabled: "true"
 
-spring_profiles_include: "prod,postgres,elastic,swagger"
+connect_config_delete_scope_enabled: true
+connect_datasource_action_enabled: true
+connect_element_template_enabled: true
+connect_external_task_script_worker_enabled: true
+connect_search_elastic_enabled: false
+connect_swagger_enabled: true
+connect_workflow_heatmap_enabled: true
 
 tenant_id: "{{ management_oidc_realm }}"
 cluster_size: "1"

roles/connect/defaults/main.yml

@@ -5,3 +5,13 @@ connect_image_name: "{{ shared_service_harbor_hostname }}/smardigo/connect-white
 connect_mail_host: "{{ shared_service_mail_hostname }}"
 connect_mail_properties_base_url: "{{ http_s }}://{{ connect_base_url }}"
 connect_mail_properties_base_url_extern: "{{ http_s }}://{{ connect_base_url }}"
+
+connect_config_delete_scope_enabled: false
+connect_config_local_import_enabled: false
+connect_datasource_action_enabled: false
+connect_element_template_enabled: false
+connect_external_task_script_worker_enabled: false
+connect_resubmission_enabled: false
+connect_search_elastic_enabled: false
+connect_swagger_enabled: true
+connect_workflow_heatmap_enabled: false

roles/connect/vars/main.yml

@@ -1,5 +1,13 @@
 ---
 
+connect_spring_profiles_include:
+  - "{{ (true)  | ternary('prod','') }}"
+  - "{{ (true)  | ternary('postgres','') }}"
+  - "{{ connect_swagger_enabled  | ternary('swagger','') }}"
+  - "{{ connect_search_elastic_enabled  | ternary('elastic','') }}"
+
+connect_process_search_module: "{{ 'external' if connect_search_elastic_enabled else 'embedded' }}"
+
 connect_labels: [
   '"traefik.enable=true"',
   '"traefik.http.routers.{{ connect_id }}.service={{ connect_id }}"',
@@ -26,7 +34,7 @@ connect_environment: [
   "SMA_JWT_SECRET: \"{{ connect_jwt_secret | default('') }}\"",
   "SMA_CSRF_TOKEN_NAME: \"{{ connect_csrf_token_name | default('') }}\"",
   "SMA_CSRF_TOKEN_VALUE: \"{{ connect_csrf_token_value | default('') }}\"",
-  "SPRING_PROFILES_INCLUDE: \"{{ spring_profiles_include | default('swagger') }}\"",
+  "SPRING_PROFILES_INCLUDE: \"{{ connect_spring_profiles_include | join(',') }}\"",
   "RIBBON_DISPLAY_ON_ACTIVE_PROFILES: \"{{ ribbon_display_on_active_profiles | default('dev') }}\"",
 
   "DATASOURCE_URL: \"jdbc:postgresql://{{ connect_postgres_host }}:{{ service_port_postgres }}/{{ connect_postgres_database }}?sslmode=require\"",
@@ -60,7 +68,7 @@ connect_environment: [
   "IAM_CLIENT_ENABLED: \"{{ smardigo_iam_client_enabled | default('false') }}\"",
   "EXTERNAL_IAM_SERVER_URL: \"{{ smardigo_iam_client_server_url | default('') }}\"",
 
-  "PROCESS_SEARCH_MODULE: \"{{ connect_process_search_module | default('embedded') }}\"",
+  "PROCESS_SEARCH_MODULE: \"{{ connect_process_search_module }}\"",
 
   "ELASTIC_HOST: \"{{ connect_elastic_host | default('') }}\"",
   "ELASTIC_PREFIX: \"{{ connect_elastic_prefix }}\"",
@@ -73,13 +81,13 @@ connect_environment: [
 
   "WORKFLOW_ENV: \"{{ connect_workflow_env | default('') }}\"",
 
-  "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled | default('false') }}\"",
+  "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled }}\"",
-  "CONFIG_LOCAL_IMPORT_ENABLED: \"{{ connect_config_local_import_enabled | default('false') }}\"",
+  "CONFIG_LOCAL_IMPORT_ENABLED: \"{{ connect_config_local_import_enabled }}\"",
-  "DATASOURCE_ACTION_ENABLED: \"{{ connect_datasource_action_enabled | default('false') }}\"",
+  "DATASOURCE_ACTION_ENABLED: \"{{ connect_datasource_action_enabled }}\"",
-  "ELEMENT_TEMPLATE_ENABLED: \"{{ connect_element_template_enabled | default('false') }}\"",
+  "ELEMENT_TEMPLATE_ENABLED: \"{{ connect_element_template_enabled }}\"",
-  "EXTERNAL_TASK_SCRIPT_WORKER_ENABLED: \"{{ connect_external_task_script_worker_enabled | default('false') }}\"",
+  "EXTERNAL_TASK_SCRIPT_WORKER_ENABLED: \"{{ connect_external_task_script_worker_enabled }}\"",
-  "RESUBMISSION_ENABLED: \"{{ connect_resubmission_enabled | default('false') }}\"",
+  "RESUBMISSION_ENABLED: \"{{ connect_resubmission_enabled }}\"",
-  "SMA_WORKFLOW_HEATMAP_ENABLED: \"{{ connect_workflow_heatmap_enabled | default('false') }}\"",
+  "SMA_WORKFLOW_HEATMAP_ENABLED: \"{{ connect_workflow_heatmap_enabled }}\"",
 
   "SMA_ENABLE_WEBDAV_DOC_EDITING: \"{{ connect_webdav_enabled | default('false') }}\"",
   "SMA_WEBDAV_BASE_PATH: \"{{ http_s }}://{{ connect_base_url }}\"",