TM-739: ncr: better support for deployments without dedicated admin s…

…erver (#1146)
ministryofjustice · Nov 29, 2024 · 1ca80ec · 1ca80ec
1 parent 9021bd9
commit 1ca80ec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ansible/group_vars/environment_name_nomis_combined_reporting_preproduction.yml b/ansible/group_vars/environment_name_nomis_combined_reporting_preproduction.yml
@@ -107,14 +107,14 @@ sap_bip_confs:
   ls:
     sap_web_java_mem: "4096"
     sap_webadmin_java_mem: "4096"
-    sap_web_disable_cmcapp: "false"
+    sap_web_has_dedicated_admin: false
     sap_bip_sso_url: "https://lsast.reporting.nomis.service.justice.gov.uk/BrowserCheck.jsp?t="
     sap_bip_rws_url: "https://lsast.reporting.nomis.service.justice.gov.uk/biprws"
     sap_provisioning_database_hostname: "lsnomis.preproduction.nomis.service.justice.gov.uk"
   pp:
     sap_web_java_mem: "22528"
     sap_webadmin_java_mem: "8192"
-    sap_web_disable_cmcapp: "true"
+    sap_web_has_dedicated_admin: true
     sap_bip_sso_url: "https://preproduction.reporting.nomis.service.justice.gov.uk/BrowserCheck.jsp?t="
     sap_bip_rws_url: "https://admin.preproduction.reporting.nomis.service.justice.gov.uk/biprws"
     sap_provisioning_database_hostname: "ppnomis.preproduction.nomis.service.justice.gov.uk"

diff --git a/ansible/group_vars/environment_name_nomis_combined_reporting_production.yml b/ansible/group_vars/environment_name_nomis_combined_reporting_production.yml
@@ -126,7 +126,7 @@ sap_bip_confs:
   pd:
     sap_web_java_mem: "22528"
     sap_webadmin_java_mem: "8192"
-    sap_web_disable_cmcapp: "true"
+    sap_web_has_dedicated_admin: true
     sap_bip_sso_url: "https://reporting.nomis.service.justice.gov.uk/BrowserCheck.jsp?t="
     sap_bip_rws_url: "https://admin.reporting.nomis.service.justice.gov.uk/biprws"
     sap_provisioning_database_hostname: "pnomis.production.nomis.service.justice.gov.uk"

diff --git a/ansible/group_vars/environment_name_nomis_combined_reporting_test.yml b/ansible/group_vars/environment_name_nomis_combined_reporting_test.yml
@@ -122,7 +122,7 @@ sap_bip_confs:
   t1:
     sap_web_java_mem: "4096"
     sap_webadmin_java_mem: "4096"
-    sap_web_disable_cmcapp: "false"
+    sap_web_has_dedicated_admin: false
     sap_bip_sso_url: "https://t1.test.reporting.nomis.service.justice.gov.uk/BrowserCheck.jsp?t="
     sap_bip_rws_url: "https://t1.test.reporting.nomis.service.justice.gov.uk/biprws"
     sap_provisioning_database_hostname: "t1nomis.test.nomis.service.justice.gov.uk"

diff --git a/ansible/group_vars/server_type_ncr_web.yml b/ansible/group_vars/server_type_ncr_web.yml
@@ -101,10 +101,19 @@ disks_mount:
 sap_bip_responsefile: response.web.ini
 sap_web_server_type: web
 sap_web_disable_infoview: "false"
-sap_web_disable_cmcapp: "{{ sap_bip_conf.sap_web_disable_cmcapp }}" # set to false if there's no dedicated webadmin server
+sap_web_disable_cmcapp: "{{ 'true' if sap_bip_conf.sap_web_has_dedicated_admin else 'false' }}"
 sap_web_server_7777_maxthreads: 1000
 sap_web_java_opts: "-Xms{{ sap_bip_conf.sap_web_java_mem }}m -Xmx{{ sap_bip_conf.sap_web_java_mem }}m -Dbobje.disable_audit_ip_lookup"
-sap_web_apps:
+sap_web_apps_with_dedicated_admin:
+  - BOE
+  - BusinessProcessBI
+  - bipodata
+  - biprws
+  - clientapi
+  - dswsbobje
+  - webi-websetup
+sap_web_apps_without_dedicated_admin:
+  - AdminTools
   - BOE
   - BusinessProcessBI
   - bipodata
@@ -113,4 +122,5 @@ sap_web_apps:
   - dswsbobje
   - webi-websetup
 
+sap_web_apps: "{{ sap_web_apps_with_dedicated_admin if sap_bip_conf.sap_web_has_dedicated_admin else sap_web_apps_without_dedicated_admin }}"
 sap_bip_sso_url: "{{ sap_bip_conf.sap_bip_sso_url }}"