Merge pull request #728 from ministryofjustice/feature/ncr-preprod-up…

…dates ncr-preprod-updates
ministryofjustice · Apr 26, 2024 · 5e833f2 · 5e833f2
2 parents b30b0a0 + a6439cb
commit 5e833f2
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 15 deletions.
diff --git a/ansible/group_vars/server_type_ncr_bip.yml b/ansible/group_vars/server_type_ncr_bip.yml
@@ -27,15 +27,15 @@ server_type_roles_list:
   - amazon-ssm-agent
   - amazon-cli
   - ansible-script
-  # - epel
-  # - disks
-  # - oracle-19c-client
-  # - oracle-tns-entries
-  # - ncr-bip
-  # - collectd
-  # - amazon-cloudwatch-agent
-  # - amazon-cloudwatch-agent-collectd
-  # - collectd-service-metrics
+  - epel
+  - disks
+  - oracle-19c-client
+  - oracle-tns-entries
+  - ncr-bip
+  - collectd
+  - amazon-cloudwatch-agent
+  - amazon-cloudwatch-agent-collectd
+  - collectd-service-metrics
 
 roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}"
 
@@ -125,3 +125,32 @@ tns_entries:
       host_list:
         - t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.internal
       service_name: BIPAUD_TAF
+  pp:
+    - name: CNOM
+      port: 1521
+      host_list:
+        - ppnomis-a.preproduction.nomis.service.justice.gov.uk
+        - ppnomis-b.preproduction.nomis.service.justice.gov.uk
+      service_name: OR_TAF
+    - name: MIS
+      port: 1521
+      host_list:
+        - ppmis-a.preproduction.nomis.service.justice.gov.uk
+        - ppmis-b.preproduction.nomis.service.justice.gov.uk
+      service_name: MIS_TAF
+    - name: CNMAUD
+      port: 1521
+      host_list:
+        - ppmis-a.preproduction.nomis.service.justice.gov.uk
+        - ppmis-b.preproduction.nomis.service.justice.gov.uk
+      service_name: CNMAUD_TAF
+    - name: BIPSYS
+      port: 1521
+      host_list:
+        - pp-ncr-db-1-a.nomis-combined-reporting.hmpps-preproduction.modernisation-platform.internal
+      service_name: BIPSYS_TAF
+    - name: BIPAUD
+      port: 1521
+      host_list:
+        - pp-ncr-db-1-a.nomis-combined-reporting.hmpps-preproduction.modernisation-platform.internal
+      service_name: BIPAUD_TAF
diff --git a/ansible/roles/ncr-bip/defaults/main.yml b/ansible/roles/ncr-bip/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001
+bip_bucket_name: mod-platform-image-artefact-bucket20230203091453221500000001
 sap_bi_platform_unpack_base_directory: /opt/sap/bip
 sap_bi_platform_extraction_directory: /u02/software/BIP_4_3_SP1
 sap_bi_platform_installation_directory: /u01/app/bobj/BIP4
@@ -11,8 +11,8 @@ node: "{{ ec2.tags['node'] }}"
 application_type: "{{ ec2.tags['type'] }}"
 
 s3:
-  bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001
-  packages_prefix: BIP/
+  bip_bucket_name: mod-platform-image-artefact-bucket20230203091453221500000001
+  packages_prefix: hmpps/ncr-packages/
   files:
     sap_bi_platform:
       - BIPLATS4303P_300-70002683_P1.EXE

diff --git a/ansible/roles/ncr-web/defaults/main.yml b/ansible/roles/ncr-web/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001
+bip_bucket_name: mod-platform-image-artefact-bucket20230203091453221500000001
 sap_bi_platform_unpack_base_directory: /opt/sap/bip
 sap_bi_platform_extraction_directory: /u02/software/BIP_4_3_SP1
 sap_bi_platform_installation_directory: /u01/app/bobj/BIP4
@@ -9,8 +9,8 @@ ncr_environment: "{{ ec2.tags['nomis-combined-reporting-environment'] }}"
 cms_name: "{{ ncr_environment }}-ncr-cms-1-a"
 
 s3:
-  bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001
-  packages_prefix: BIP/
+  bip_bucket_name: mod-platform-image-artefact-bucket20230203091453221500000001
+  packages_prefix: hmpps/ncr-packages/
   files:
     sap_bi_platform:
       - BIPLATS4303P_300-70002683_P1.EXE