Merge pull request #674 from ministryofjustice/feature/DSOS-2710/ansi…

…ble-roles-ncr

DSOS-2710-ansible-roles

ansible/group_vars/server_type_ncr_bip.yml

@@ -27,22 +27,27 @@ 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([])) }}"
 
 packages_yum_install:
   - nano
   - vim
   - make
+  - gdb
+  - libnsl
+  - libnsl.i686
+  - libnsl2
+  - libnsl2.i686
   - libstdc++.i686
   - libstdc++.x86_64
   - glibc.i686
@@ -51,12 +56,11 @@ packages_yum_install:
   - libX11.x86_64
   - libXext.i686
   - libXext.x86_64
-  - expat.i686
+  # - expat.i686
   - expat.x86_64
   - libxcrypt.i686
   - libgcc.i686
   - libgcc.x86_64
-  - libnsl.i686
   - libXcursor.i686
   - libXcursor.x86_64
   - libXrender.i686
@@ -67,6 +71,11 @@ packages_yum_install:
   - libxcb.x86_64
   - libXau.i686
   - libXau.x86_64
+  - ksh
+  - nfs-utils
+  - psmisc
+  - tcsh
+  - uuidd
   - xz-libs.i686
 
 disks_mount:
@@ -88,31 +97,31 @@ oracle_inventory: /u01/app/oraInventory
 
 tns_entries:
   t1:
-    - name: T1CNOM
+    - name: CNOM
       port: 1521
       host_list:
         - t1nomis-a.test.nomis.service.justice.gov.uk
         - t1nomis-b.test.nomis.service.justice.gov.uk
-      service_name: T1CNOM
-    - name: T1MIS
+      service_name: OR_TAF
+    - name: MIS
       port: 1521
       host_list:
         - t1mis-a.test.nomis.service.justice.gov.uk
         - t1mis-b.test.nomis.service.justice.gov.uk
-      service_name: T1MIS
-    - name: T1CNMAUD
+      service_name: MIS_TAF
+    - name: CNMAUD
       port: 1521
       host_list:
         - t1mis-a.test.nomis.service.justice.gov.uk
         - t1mis-b.test.nomis.service.justice.gov.uk
-      service_name: T1CNMAUD
-    - name: T1BIPSYS
+      service_name: CNMAUD_TAF
+    - name: BIPSYS
       port: 1521
       host_list:
         - t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.internal
-      service_name: T1BIPSYS
-    - name: T1BIPAUD
+      service_name: BIPSYS_TAF
+    - name: BIPAUD
       port: 1521
       host_list:
         - t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.internal
-      service_name: T1BIPAUD
+      service_name: BIPAUD_TAF

ansible/group_vars/server_type_ncr_tomcat.yml → ansible/group_vars/server_type_ncr_web.yml

@@ -29,7 +29,7 @@ server_type_roles_list:
   - ansible-script
   - epel
   - disks
-  - ncr-tomcat
+  - ncr-web
   - collectd
   - amazon-cloudwatch-agent
   - amazon-cloudwatch-agent-collectd
@@ -41,15 +41,17 @@ packages_yum_install:
   - nano
   - vim
   - make
+  - bind-utils
   - libstdc++.i686
   - libstdc++.x86_64
+  - gdb
   - glibc.i686
   - glibc.x86_64
   - libX11.i686
   - libX11.x86_64
   - libXext.i686
   - libXext.x86_64
-  - expat.i686
+  #- expat.i686
   - expat.x86_64
   - libxcrypt.i686
   - libgcc.i686
@@ -65,6 +67,11 @@ packages_yum_install:
   - libxcb.x86_64
   - libXau.i686
   - libXau.x86_64
+  - ksh
+  - nfs-utils
+  - psmisc
+  - tcsh
+  - uuidd
   - xz-libs.i686
 
 disks_mount: