From 9e64727a5d3f6cdab87370de6348a7a0658cd118 Mon Sep 17 00:00:00 2001 From: Craig Gilbertson Date: Mon, 8 Apr 2024 09:39:50 +0100 Subject: [PATCH 1/2] DSOS-2710-ansible-roles --- ansible/group_vars/server_type_ncr_bip.yml | 51 +++++--- .../group_vars/server_type_ncr_bip_cms.yml | 121 ------------------ .../server_type_ncr_tomcat_admin.yml | 79 ------------ ...ncr_tomcat.yml => server_type_ncr_web.yml} | 11 +- ansible/roles/ncr-bip-cms/tasks/get_facts.yml | 31 ----- .../defaults/main.yml | 12 +- .../{ncr-bip-cms => ncr-bip}/meta/main.yml | 0 .../tasks/add_groups.yml | 0 .../tasks/add_response_file.yml | 18 +-- .../tasks/assign_permissions.yml | 0 .../tasks/extract_files.yml | 0 ansible/roles/ncr-bip/tasks/get_facts.yml | 31 +++++ .../tasks/install_bip.yml} | 2 +- .../tasks/install_host_agent.yml | 2 +- .../tasks/install_packages.yml | 0 .../{ncr-bip-cms => ncr-bip}/tasks/main.yml | 9 +- .../tasks/retrieve_files.yml | 0 .../{ncr-bip-cms => ncr-bip}/tasks/users.yml | 0 .../templates/home/bobj/.bash_profile | 0 .../app/bobj/BIP4/sap_bobj/init/setupinit.sh | 0 .../software/BIP_4_3_SP1/bip_response.ini} | 0 .../software/BIP_4_3_SP1/prereq_checks.ini | 0 .../ncr-tomcat-admin/tasks/get_facts.yml | 11 -- .../defaults/main.yml | 12 +- .../meta/main.yml | 0 .../tasks/add_groups.yml | 0 .../tasks/add_response_file.yml | 10 +- .../tasks/assign_permissions.yml | 0 .../tasks/extract_files.yml | 0 ansible/roles/ncr-web/tasks/get_facts.yml | 11 ++ .../tasks/install_packages.yml | 0 .../tasks/install_tomcat.yml | 2 +- .../tasks/main.yml | 1 + .../tasks/post_installation_config.yml | 0 .../tasks/retrieve_files.yml | 0 .../templates/context.xml | 0 .../templates/properties/BILogon.properties | 0 .../templates/properties/CmcApp.properties | 0 .../templates/properties/FioriBI.properties | 0 .../properties/OpenDocument.properties | 0 .../properties/PlatformServices.properties | 0 .../templates/properties/biprws.properties | 0 .../templates/properties/global.properties | 0 .../templates/root/BIP_profile_icon.png | 0 .../templates/root/BIP_profile_menu_70pct.png | 0 .../templates/root/BIlogoff.jsp | 0 .../templates/root/BrowserCheck.jsp | 0 .../templates/root/BrowserCheck_Offline.jsp | 0 .../templates/root/InfoView.ico | 0 .../templates/root/Unsupported_Browser.html | 0 .../templates/root/browsercheck.css | 0 .../templates/root/browsercheck.js | 0 .../templates/root/index.jsp | 0 .../templates/root/keepalive.htm | 0 .../templates/server.xml | 0 .../templates/setenv.sh | 0 .../app/bobj/BIP4/sap_bobj/init/setupinit.sh | 0 .../software/BIP_4_3_SP1/prereq_checks.ini | 0 .../software/BIP_4_3_SP1/web_response.ini} | 0 .../templates/wdeploy.conf | 0 60 files changed, 120 insertions(+), 294 deletions(-) delete mode 100644 ansible/group_vars/server_type_ncr_bip_cms.yml delete mode 100644 ansible/group_vars/server_type_ncr_tomcat_admin.yml rename ansible/group_vars/{server_type_ncr_tomcat.yml => server_type_ncr_web.yml} (93%) delete mode 100644 ansible/roles/ncr-bip-cms/tasks/get_facts.yml rename ansible/roles/{ncr-bip-cms => ncr-bip}/defaults/main.yml (76%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/meta/main.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/add_groups.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/add_response_file.yml (73%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/assign_permissions.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/extract_files.yml (100%) create mode 100644 ansible/roles/ncr-bip/tasks/get_facts.yml rename ansible/roles/{ncr-bip-cms/tasks/install_bip_cms.yml => ncr-bip/tasks/install_bip.yml} (95%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/install_host_agent.yml (95%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/install_packages.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/main.yml (86%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/retrieve_files.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/tasks/users.yml (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/templates/home/bobj/.bash_profile (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh (100%) rename ansible/roles/{ncr-bip-cms/templates/u02/software/BIP_4_3_SP1/cms_response.ini => ncr-bip/templates/u02/software/BIP_4_3_SP1/bip_response.ini} (100%) rename ansible/roles/{ncr-bip-cms => ncr-bip}/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini (100%) delete mode 100644 ansible/roles/ncr-tomcat-admin/tasks/get_facts.yml rename ansible/roles/{ncr-tomcat-admin => ncr-web}/defaults/main.yml (82%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/meta/main.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/add_groups.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/add_response_file.yml (68%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/assign_permissions.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/extract_files.yml (100%) create mode 100644 ansible/roles/ncr-web/tasks/get_facts.yml rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/install_packages.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/install_tomcat.yml (94%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/main.yml (99%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/post_installation_config.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/tasks/retrieve_files.yml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/context.xml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/BILogon.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/CmcApp.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/FioriBI.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/OpenDocument.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/PlatformServices.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/biprws.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/properties/global.properties (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/BIP_profile_icon.png (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/BIP_profile_menu_70pct.png (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/BIlogoff.jsp (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/BrowserCheck.jsp (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/BrowserCheck_Offline.jsp (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/InfoView.ico (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/Unsupported_Browser.html (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/browsercheck.css (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/browsercheck.js (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/index.jsp (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/root/keepalive.htm (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/server.xml (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/setenv.sh (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini (100%) rename ansible/roles/{ncr-tomcat-admin/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini => ncr-web/templates/u02/software/BIP_4_3_SP1/web_response.ini} (100%) rename ansible/roles/{ncr-tomcat-admin => ncr-web}/templates/wdeploy.conf (100%) diff --git a/ansible/group_vars/server_type_ncr_bip.yml b/ansible/group_vars/server_type_ncr_bip.yml index 974ee3499..6e85139fc 100644 --- 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([])) }}" @@ -43,6 +43,11 @@ 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 diff --git a/ansible/group_vars/server_type_ncr_bip_cms.yml b/ansible/group_vars/server_type_ncr_bip_cms.yml deleted file mode 100644 index cb63df697..000000000 --- a/ansible/group_vars/server_type_ncr_bip_cms.yml +++ /dev/null @@ -1,121 +0,0 @@ ---- -ansible_python_interpreter: /usr/bin/python3.9 - -users_and_groups_system: - - name: oracle - group: oinstall - groups: - - dba - - wheel - - name: bobj - group: binstall - groups: - - dba - - sapsys - -server_type_roles_list: - - users-and-groups - - sudoers - - get-ec2-facts - - set-ec2-hostname - - domain-search - - disable-ipv6 - - disable-firewall - - time - - packages - - message-of-the-day - - amazon-ssm-agent - - amazon-cli - - ansible-script - - epel - - disks - - oracle-19c-client - - oracle-tns-entries - - ncr-bip-cms - - 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 - - libnsl - - libnsl.i686 - - libnsl2 - - libnsl2.i686 - - libstdc++.i686 - - libstdc++.x86_64 - - glibc.i686 - - glibc.x86_64 - - libX11.i686 - - libX11.x86_64 - - libXext.i686 - - libXext.x86_64 - - expat.i686 - - expat.x86_64 - - libxcrypt.i686 - - libgcc.i686 - - libgcc.x86_64 - - libXcursor.i686 - - libXcursor.x86_64 - - libXrender.i686 - - libXrender.x86_64 - - libXfixes.i686 - - libXfixes.x86_64 - - libxcb.i686 - - libxcb.x86_64 - - libXau.i686 - - libXau.x86_64 - - xz-libs.i686 - -disks_mount: - - ebs_device_name: /dev/sdb - dir: /u01 - fstype: xfs - - ebs_device_name: /dev/sdc - dir: /u02 - fstype: xfs - - ebs_device_name: /dev/sds - dir: swap - fstype: swap - -# oracle client -oracle_install_user: oracle -oracle_install_group: oinstall -oracle_home: /u01/app/oracle/product/19c/client_1 -oracle_inventory: /u01/app/oraInventory - -tns_entries: - t1: - - name: CNOM - port: 1521 - host_list: - - t1nomis-a.test.nomis.service.justice.gov.uk - - t1nomis-b.test.nomis.service.justice.gov.uk - 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: 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: CNMAUD_TAF - - name: BIPSYS - port: 1521 - host_list: - - t1-ncr-db-1-a.nomis-combined-reporting.hmpps-test.modernisation-platform.internal - 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: BIPAUD_TAF diff --git a/ansible/group_vars/server_type_ncr_tomcat_admin.yml b/ansible/group_vars/server_type_ncr_tomcat_admin.yml deleted file mode 100644 index c1d8cca40..000000000 --- a/ansible/group_vars/server_type_ncr_tomcat_admin.yml +++ /dev/null @@ -1,79 +0,0 @@ ---- -ansible_python_interpreter: /usr/bin/python3.9 - -users_and_groups_system: - - name: oracle - group: oinstall - groups: - - dba - - wheel - - name: bobj - group: binstall - groups: - - dba - - sapsys - -server_type_roles_list: - - users-and-groups - - sudoers - - get-ec2-facts - - set-ec2-hostname - - domain-search - - disable-ipv6 - - disable-firewall - - time - - packages - - message-of-the-day - - amazon-ssm-agent - - amazon-cli - - ansible-script - - epel - - disks - - ncr-tomcat-admin - - 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 - - libstdc++.i686 - - libstdc++.x86_64 - - glibc.i686 - - glibc.x86_64 - - libX11.i686 - - libX11.x86_64 - - libXext.i686 - - libXext.x86_64 - - expat.i686 - - expat.x86_64 - - libxcrypt.i686 - - libgcc.i686 - - libgcc.x86_64 - - libnsl.i686 - - libXcursor.i686 - - libXcursor.x86_64 - - libXrender.i686 - - libXrender.x86_64 - - libXfixes.i686 - - libXfixes.x86_64 - - libxcb.i686 - - libxcb.x86_64 - - libXau.i686 - - libXau.x86_64 - - xz-libs.i686 - -disks_mount: - - ebs_device_name: /dev/sdb - dir: /u01 - fstype: xfs - - ebs_device_name: /dev/sdc - dir: /u02 - fstype: xfs - - ebs_device_name: /dev/sds - dir: swap - fstype: swap diff --git a/ansible/group_vars/server_type_ncr_tomcat.yml b/ansible/group_vars/server_type_ncr_web.yml similarity index 93% rename from ansible/group_vars/server_type_ncr_tomcat.yml rename to ansible/group_vars/server_type_ncr_web.yml index 29835e9b7..c727e0e8d 100644 --- a/ansible/group_vars/server_type_ncr_tomcat.yml +++ b/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: diff --git a/ansible/roles/ncr-bip-cms/tasks/get_facts.yml b/ansible/roles/ncr-bip-cms/tasks/get_facts.yml deleted file mode 100644 index 6f2d21377..000000000 --- a/ansible/roles/ncr-bip-cms/tasks/get_facts.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: Get secretsmanager passwords - import_role: - name: secretsmanager-passwords - vars: - secretsmanager_passwords: "{{ bip_cms_secretsmanager_passwords }}" - -- name: Set secretsmanager password facts - set_fact: - cms_cluster_key: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['cms_cluster_key'] }}" - cms_admin_password: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['cms_admin_password'] }}" - cms_db_password: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['cms_db_password'] }}" - lcm_password: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['lcm_password'] }}" - product_key: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['product_key'] }}" - auditing_db_password: "{{ secretsmanager_passwords_dict['bip_cms'].passwords['auditing_db_password'] }}" - -- name: Check all SSM parameters and tags are set - set_fact: - bip_cms_all_variables_set: true - when: - - cms_cluster_key|length > 0 - - cms_admin_password|length > 0 - - lcm_password|length > 0 - - cms_db_password|length > 0 - - auditing_db_password|length > 0 - - product_key|length > 0 - -- name: Fail if missing SSM parameters or tags - fail: - msg: Ensure all required SSM parameters and tags are set - when: not bip_cms_all_variables_set|default(false) diff --git a/ansible/roles/ncr-bip-cms/defaults/main.yml b/ansible/roles/ncr-bip/defaults/main.yml similarity index 76% rename from ansible/roles/ncr-bip-cms/defaults/main.yml rename to ansible/roles/ncr-bip/defaults/main.yml index d5e65a827..4d020dfeb 100644 --- a/ansible/roles/ncr-bip-cms/defaults/main.yml +++ b/ansible/roles/ncr-bip/defaults/main.yml @@ -4,9 +4,11 @@ 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 sap_jvm_unpack_base_directory: /opt/sap/java +sap_host_agent_base_directory: /opt/sap/hostagent ncr_environment: "{{ ec2.tags['nomis-combined-reporting-environment'] }}" node: "{{ ec2.tags['node'] }}" +application_type: "{{ ec2.tags['type'] }}" s3: bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001 @@ -19,10 +21,10 @@ s3: sap_jvm: SAPJVM8_94-80000202.SAR sapcar: SAPCAR_1324-80000935.EXE -ssm_parameters_prefix: "bip-cms" +ssm_parameters_prefix: "bip" -bip_cms_secretsmanager_passwords: - bip_cms: - secret: "/ec2/ncr-bip-cms/{{ ncr_environment }}/passwords" +bip_secretsmanager_passwords: + bip: + secret: "/ec2/ncr-bip/{{ ncr_environment }}/passwords" users: - - bip_cms: auto + - bip: auto diff --git a/ansible/roles/ncr-bip-cms/meta/main.yml b/ansible/roles/ncr-bip/meta/main.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/meta/main.yml rename to ansible/roles/ncr-bip/meta/main.yml diff --git a/ansible/roles/ncr-bip-cms/tasks/add_groups.yml b/ansible/roles/ncr-bip/tasks/add_groups.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/add_groups.yml rename to ansible/roles/ncr-bip/tasks/add_groups.yml diff --git a/ansible/roles/ncr-bip-cms/tasks/add_response_file.yml b/ansible/roles/ncr-bip/tasks/add_response_file.yml similarity index 73% rename from ansible/roles/ncr-bip-cms/tasks/add_response_file.yml rename to ansible/roles/ncr-bip/tasks/add_response_file.yml index 1910f80e0..17cae27a5 100644 --- a/ansible/roles/ncr-bip-cms/tasks/add_response_file.yml +++ b/ansible/roles/ncr-bip/tasks/add_response_file.yml @@ -8,50 +8,50 @@ - name: Copy response file ansible.builtin.template: - src: u02/software/BIP_4_3_SP1/cms_response.ini - dest: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + src: u02/software/BIP_4_3_SP1/bip_response.ini + dest: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" owner: bobj group: binstall mode: "0755" - name: Ensure cms cluster key is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^clusterkey=" line: "clusterkey={{ cms_cluster_key }}" - name: Ensure cms admin password is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^cmspassword=" line: "cmspassword={{ cms_admin_password }}" - name: Ensure lcm password is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^lcmpassword=" line: "lcmpassword={{ lcm_password }}" - name: Ensure cms db password is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^existingcmsdbpassword=" line: "existingcmsdbpassword={{ cms_db_password }}" - name: Ensure auditing db password is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^existingauditingdbpassword=" line: "existingauditingdbpassword={{ auditing_db_password }}" - name: Ensure product key is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^productkey=" line: "productkey={{ product_key }}" - name: Ensure node name is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/cms_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/bip_response.ini" regexp: "^sianame=" line: "sianame={{ ncr_environment }}ncr{{ node }}" diff --git a/ansible/roles/ncr-bip-cms/tasks/assign_permissions.yml b/ansible/roles/ncr-bip/tasks/assign_permissions.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/assign_permissions.yml rename to ansible/roles/ncr-bip/tasks/assign_permissions.yml diff --git a/ansible/roles/ncr-bip-cms/tasks/extract_files.yml b/ansible/roles/ncr-bip/tasks/extract_files.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/extract_files.yml rename to ansible/roles/ncr-bip/tasks/extract_files.yml diff --git a/ansible/roles/ncr-bip/tasks/get_facts.yml b/ansible/roles/ncr-bip/tasks/get_facts.yml new file mode 100644 index 000000000..c007428f1 --- /dev/null +++ b/ansible/roles/ncr-bip/tasks/get_facts.yml @@ -0,0 +1,31 @@ +--- +- name: Get secretsmanager passwords + import_role: + name: secretsmanager-passwords + vars: + secretsmanager_passwords: "{{ bip_secretsmanager_passwords }}" + +- name: Set secretsmanager password facts + set_fact: + cms_cluster_key: "{{ secretsmanager_passwords_dict['bip'].passwords['cms_cluster_key'] }}" + cms_admin_password: "{{ secretsmanager_passwords_dict['bip'].passwords['cms_admin_password'] }}" + cms_db_password: "{{ secretsmanager_passwords_dict['bip'].passwords['cms_db_password'] }}" + lcm_password: "{{ secretsmanager_passwords_dict['bip'].passwords['lcm_password'] }}" + product_key: "{{ secretsmanager_passwords_dict['bip'].passwords['product_key'] }}" + auditing_db_password: "{{ secretsmanager_passwords_dict['bip'].passwords['auditing_db_password'] }}" + +- name: Check all SSM parameters and tags are set + set_fact: + bip_all_variables_set: true + when: + - cms_cluster_key|length > 0 + - cms_admin_password|length > 0 + - lcm_password|length > 0 + - cms_db_password|length > 0 + - auditing_db_password|length > 0 + - product_key|length > 0 + +- name: Fail if missing SSM parameters or tags + fail: + msg: Ensure all required SSM parameters and tags are set + when: not bip_all_variables_set|default(false) diff --git a/ansible/roles/ncr-bip-cms/tasks/install_bip_cms.yml b/ansible/roles/ncr-bip/tasks/install_bip.yml similarity index 95% rename from ansible/roles/ncr-bip-cms/tasks/install_bip_cms.yml rename to ansible/roles/ncr-bip/tasks/install_bip.yml index 08ddb4e44..23f87803c 100644 --- a/ansible/roles/ncr-bip-cms/tasks/install_bip_cms.yml +++ b/ansible/roles/ncr-bip/tasks/install_bip.yml @@ -15,7 +15,7 @@ become_user: bobj ansible.builtin.shell: | . ~/.bash_profile - /u02/software/BIP_4_3_SP1/setup.sh -InstallDir /u01/app/bobj/BIP4/ -r /u02/software/BIP_4_3_SP1/cms_response.ini + /u02/software/BIP_4_3_SP1/setup.sh -InstallDir /u01/app/bobj/BIP4/ -r /u02/software/BIP_4_3_SP1/bip_response.ini when: not bip_installed_check.stat.exists - name: Check if init has been run diff --git a/ansible/roles/ncr-bip-cms/tasks/install_host_agent.yml b/ansible/roles/ncr-bip/tasks/install_host_agent.yml similarity index 95% rename from ansible/roles/ncr-bip-cms/tasks/install_host_agent.yml rename to ansible/roles/ncr-bip/tasks/install_host_agent.yml index 7d85e1491..c526dd5e1 100644 --- a/ansible/roles/ncr-bip-cms/tasks/install_host_agent.yml +++ b/ansible/roles/ncr-bip/tasks/install_host_agent.yml @@ -9,7 +9,7 @@ aws_s3: mode: get bucket: "{{ s3.bip_bucket_name }}" - object: "{{ s3.prefix }}{{ item }}" + object: "{{ s3.packages_prefix }}{{ item }}" dest: "{{ sap_host_agent_base_directory }}/{{ item|basename }}" overwrite: true with_items: diff --git a/ansible/roles/ncr-bip-cms/tasks/install_packages.yml b/ansible/roles/ncr-bip/tasks/install_packages.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/install_packages.yml rename to ansible/roles/ncr-bip/tasks/install_packages.yml diff --git a/ansible/roles/ncr-bip-cms/tasks/main.yml b/ansible/roles/ncr-bip/tasks/main.yml similarity index 86% rename from ansible/roles/ncr-bip-cms/tasks/main.yml rename to ansible/roles/ncr-bip/tasks/main.yml index c892d6ff6..220375160 100644 --- a/ansible/roles/ncr-bip-cms/tasks/main.yml +++ b/ansible/roles/ncr-bip/tasks/main.yml @@ -46,7 +46,14 @@ - amibuild - ec2provision when: ansible_distribution in ['RedHat'] -# - import_tasks: install_bip_cms.yml + +- import_tasks: install_host_agent.yml + tags: + - amibuild + - ec2provision + when: ansible_distribution in ['RedHat'] + +# - import_tasks: install_bip.yml # tags: # - amibuild # - ec2provision diff --git a/ansible/roles/ncr-bip-cms/tasks/retrieve_files.yml b/ansible/roles/ncr-bip/tasks/retrieve_files.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/retrieve_files.yml rename to ansible/roles/ncr-bip/tasks/retrieve_files.yml diff --git a/ansible/roles/ncr-bip-cms/tasks/users.yml b/ansible/roles/ncr-bip/tasks/users.yml similarity index 100% rename from ansible/roles/ncr-bip-cms/tasks/users.yml rename to ansible/roles/ncr-bip/tasks/users.yml diff --git a/ansible/roles/ncr-bip-cms/templates/home/bobj/.bash_profile b/ansible/roles/ncr-bip/templates/home/bobj/.bash_profile similarity index 100% rename from ansible/roles/ncr-bip-cms/templates/home/bobj/.bash_profile rename to ansible/roles/ncr-bip/templates/home/bobj/.bash_profile diff --git a/ansible/roles/ncr-bip-cms/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh b/ansible/roles/ncr-bip/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh similarity index 100% rename from ansible/roles/ncr-bip-cms/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh rename to ansible/roles/ncr-bip/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh diff --git a/ansible/roles/ncr-bip-cms/templates/u02/software/BIP_4_3_SP1/cms_response.ini b/ansible/roles/ncr-bip/templates/u02/software/BIP_4_3_SP1/bip_response.ini similarity index 100% rename from ansible/roles/ncr-bip-cms/templates/u02/software/BIP_4_3_SP1/cms_response.ini rename to ansible/roles/ncr-bip/templates/u02/software/BIP_4_3_SP1/bip_response.ini diff --git a/ansible/roles/ncr-bip-cms/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini b/ansible/roles/ncr-bip/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini similarity index 100% rename from ansible/roles/ncr-bip-cms/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini rename to ansible/roles/ncr-bip/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini diff --git a/ansible/roles/ncr-tomcat-admin/tasks/get_facts.yml b/ansible/roles/ncr-tomcat-admin/tasks/get_facts.yml deleted file mode 100644 index 206e7e7a7..000000000 --- a/ansible/roles/ncr-tomcat-admin/tasks/get_facts.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Get tomcat secrets - import_role: - name: secretsmanager-passwords - vars: - secretsmanager_passwords: "{{ tomcat_admin_secretsmanager_passwords }}" - -- name: Set password facts - set_fact: - cms_admin_password: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['cms_admin_password'] }}" - product_key: "{{ secretsmanager_passwords_dict['tomcat_admin'].passwords['product_key'] }}" diff --git a/ansible/roles/ncr-tomcat-admin/defaults/main.yml b/ansible/roles/ncr-web/defaults/main.yml similarity index 82% rename from ansible/roles/ncr-tomcat-admin/defaults/main.yml rename to ansible/roles/ncr-web/defaults/main.yml index 9e511f512..29cdd9f32 100644 --- a/ansible/roles/ncr-tomcat-admin/defaults/main.yml +++ b/ansible/roles/ncr-web/defaults/main.yml @@ -6,7 +6,7 @@ sap_bi_platform_installation_directory: /u01/app/bobj/BIP4 sap_jvm_unpack_base_directory: /opt/sap/java ncr_environment: "{{ ec2.tags['nomis-combined-reporting-environment'] }}" -cms_name: "{{ ncr_environment }}-ncr-cms" +cms_name: "{{ ncr_environment }}-ncr-cms-1-a" s3: bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001 @@ -18,7 +18,7 @@ s3: sap_jvm: SAPJVM8_94-80000202.SAR sapcar: SAPCAR_1324-80000935.EXE -ssm_parameters_prefix: "tomcat" +ssm_parameters_prefix: "web" tomcat_post_install_directories: tomcat: /u01/app/bobj/BIP4/sap_bobj/tomcat @@ -26,8 +26,8 @@ tomcat_post_install_directories: biprws_config: /u01/app/bobj/BIP4/sap_bobj/enterprise_xi40/warfiles/webapps/biprws/WEB-INF/config/custom webapps_root: /u01/app/bobj/BIP4/sap_bobj/enterprise_xi40/warfiles/webapps/ROOT -tomcat_admin_secretsmanager_passwords: - tomcat_admin: - secret: "/ec2/ncr-tomcat-admin/{{ ncr_environment }}/passwords" +web_secretsmanager_passwords: + web: + secret: "/ec2/ncr-web/{{ ncr_environment }}/passwords" users: - - tomcat_admin: auto + - web: auto diff --git a/ansible/roles/ncr-tomcat-admin/meta/main.yml b/ansible/roles/ncr-web/meta/main.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/meta/main.yml rename to ansible/roles/ncr-web/meta/main.yml diff --git a/ansible/roles/ncr-tomcat-admin/tasks/add_groups.yml b/ansible/roles/ncr-web/tasks/add_groups.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/add_groups.yml rename to ansible/roles/ncr-web/tasks/add_groups.yml diff --git a/ansible/roles/ncr-tomcat-admin/tasks/add_response_file.yml b/ansible/roles/ncr-web/tasks/add_response_file.yml similarity index 68% rename from ansible/roles/ncr-tomcat-admin/tasks/add_response_file.yml rename to ansible/roles/ncr-web/tasks/add_response_file.yml index 3e74ca43a..2fa719ea5 100644 --- a/ansible/roles/ncr-tomcat-admin/tasks/add_response_file.yml +++ b/ansible/roles/ncr-web/tasks/add_response_file.yml @@ -8,26 +8,26 @@ - name: Copy response file ansible.builtin.template: - src: u02/software/BIP_4_3_SP1/tomcat_admin_response.ini - dest: "{{ sap_bi_platform_extraction_directory }}/tomcat_admin_response.ini" + src: u02/software/BIP_4_3_SP1/web_response.ini + dest: "{{ sap_bi_platform_extraction_directory }}/web_response.ini" owner: bobj group: binstall mode: "0755" - name: Ensure product key is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/tomcat_admin_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/web_response.ini" regexp: "^productkey=" line: "productkey={{ product_key }}" - name: Ensure CMS password is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/tomcat_admin_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/web_response.ini" regexp: "^remotecmsadminpassword=" line: "remotecmsadminpassword={{ cms_admin_password }}" - name: Ensure CMS name is set in response file ansible.builtin.lineinfile: - path: "{{ sap_bi_platform_extraction_directory }}/tomcat_admin_response.ini" + path: "{{ sap_bi_platform_extraction_directory }}/web_response.ini" regexp: "^remotecmsname=" line: "remotecmsname={{ cms_name }}" diff --git a/ansible/roles/ncr-tomcat-admin/tasks/assign_permissions.yml b/ansible/roles/ncr-web/tasks/assign_permissions.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/assign_permissions.yml rename to ansible/roles/ncr-web/tasks/assign_permissions.yml diff --git a/ansible/roles/ncr-tomcat-admin/tasks/extract_files.yml b/ansible/roles/ncr-web/tasks/extract_files.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/extract_files.yml rename to ansible/roles/ncr-web/tasks/extract_files.yml diff --git a/ansible/roles/ncr-web/tasks/get_facts.yml b/ansible/roles/ncr-web/tasks/get_facts.yml new file mode 100644 index 000000000..46fb20c17 --- /dev/null +++ b/ansible/roles/ncr-web/tasks/get_facts.yml @@ -0,0 +1,11 @@ +--- +- name: Get tomcat secrets + import_role: + name: secretsmanager-passwords + vars: + secretsmanager_passwords: "{{ web_secretsmanager_passwords }}" + +- name: Set password facts + set_fact: + cms_admin_password: "{{ secretsmanager_passwords_dict['web'].passwords['cms_admin_password'] }}" + product_key: "{{ secretsmanager_passwords_dict['web'].passwords['product_key'] }}" diff --git a/ansible/roles/ncr-tomcat-admin/tasks/install_packages.yml b/ansible/roles/ncr-web/tasks/install_packages.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/install_packages.yml rename to ansible/roles/ncr-web/tasks/install_packages.yml diff --git a/ansible/roles/ncr-tomcat-admin/tasks/install_tomcat.yml b/ansible/roles/ncr-web/tasks/install_tomcat.yml similarity index 94% rename from ansible/roles/ncr-tomcat-admin/tasks/install_tomcat.yml rename to ansible/roles/ncr-web/tasks/install_tomcat.yml index 146808d13..5d851f69a 100644 --- a/ansible/roles/ncr-tomcat-admin/tasks/install_tomcat.yml +++ b/ansible/roles/ncr-web/tasks/install_tomcat.yml @@ -15,7 +15,7 @@ become_user: bobj ansible.builtin.shell: | . ~/.bash_profile - /u02/software/BIP_4_3_SP1/setup.sh -InstallDir /u01/app/bobj/BIP4/ -r /u02/software/BIP_4_3_SP1/tomcat_admin_response.ini + /u02/software/BIP_4_3_SP1/setup.sh -InstallDir /u01/app/bobj/BIP4/ -r /u02/software/BIP_4_3_SP1/web_response.ini when: not bip_installed_check.stat.exists - name: Check if init has been run diff --git a/ansible/roles/ncr-tomcat-admin/tasks/main.yml b/ansible/roles/ncr-web/tasks/main.yml similarity index 99% rename from ansible/roles/ncr-tomcat-admin/tasks/main.yml rename to ansible/roles/ncr-web/tasks/main.yml index 6beffbb00..499255251 100644 --- a/ansible/roles/ncr-tomcat-admin/tasks/main.yml +++ b/ansible/roles/ncr-web/tasks/main.yml @@ -40,6 +40,7 @@ - amibuild - ec2provision when: ansible_distribution in ['RedHat'] + # - import_tasks: install_tomcat.yml # tags: # - amibuild diff --git a/ansible/roles/ncr-tomcat-admin/tasks/post_installation_config.yml b/ansible/roles/ncr-web/tasks/post_installation_config.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/post_installation_config.yml rename to ansible/roles/ncr-web/tasks/post_installation_config.yml diff --git a/ansible/roles/ncr-tomcat-admin/tasks/retrieve_files.yml b/ansible/roles/ncr-web/tasks/retrieve_files.yml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/tasks/retrieve_files.yml rename to ansible/roles/ncr-web/tasks/retrieve_files.yml diff --git a/ansible/roles/ncr-tomcat-admin/templates/context.xml b/ansible/roles/ncr-web/templates/context.xml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/context.xml rename to ansible/roles/ncr-web/templates/context.xml diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/BILogon.properties b/ansible/roles/ncr-web/templates/properties/BILogon.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/BILogon.properties rename to ansible/roles/ncr-web/templates/properties/BILogon.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/CmcApp.properties b/ansible/roles/ncr-web/templates/properties/CmcApp.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/CmcApp.properties rename to ansible/roles/ncr-web/templates/properties/CmcApp.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/FioriBI.properties b/ansible/roles/ncr-web/templates/properties/FioriBI.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/FioriBI.properties rename to ansible/roles/ncr-web/templates/properties/FioriBI.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/OpenDocument.properties b/ansible/roles/ncr-web/templates/properties/OpenDocument.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/OpenDocument.properties rename to ansible/roles/ncr-web/templates/properties/OpenDocument.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/PlatformServices.properties b/ansible/roles/ncr-web/templates/properties/PlatformServices.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/PlatformServices.properties rename to ansible/roles/ncr-web/templates/properties/PlatformServices.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/biprws.properties b/ansible/roles/ncr-web/templates/properties/biprws.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/biprws.properties rename to ansible/roles/ncr-web/templates/properties/biprws.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/properties/global.properties b/ansible/roles/ncr-web/templates/properties/global.properties similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/properties/global.properties rename to ansible/roles/ncr-web/templates/properties/global.properties diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/BIP_profile_icon.png b/ansible/roles/ncr-web/templates/root/BIP_profile_icon.png similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/BIP_profile_icon.png rename to ansible/roles/ncr-web/templates/root/BIP_profile_icon.png diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/BIP_profile_menu_70pct.png b/ansible/roles/ncr-web/templates/root/BIP_profile_menu_70pct.png similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/BIP_profile_menu_70pct.png rename to ansible/roles/ncr-web/templates/root/BIP_profile_menu_70pct.png diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/BIlogoff.jsp b/ansible/roles/ncr-web/templates/root/BIlogoff.jsp similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/BIlogoff.jsp rename to ansible/roles/ncr-web/templates/root/BIlogoff.jsp diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/BrowserCheck.jsp b/ansible/roles/ncr-web/templates/root/BrowserCheck.jsp similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/BrowserCheck.jsp rename to ansible/roles/ncr-web/templates/root/BrowserCheck.jsp diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/BrowserCheck_Offline.jsp b/ansible/roles/ncr-web/templates/root/BrowserCheck_Offline.jsp similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/BrowserCheck_Offline.jsp rename to ansible/roles/ncr-web/templates/root/BrowserCheck_Offline.jsp diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/InfoView.ico b/ansible/roles/ncr-web/templates/root/InfoView.ico similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/InfoView.ico rename to ansible/roles/ncr-web/templates/root/InfoView.ico diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/Unsupported_Browser.html b/ansible/roles/ncr-web/templates/root/Unsupported_Browser.html similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/Unsupported_Browser.html rename to ansible/roles/ncr-web/templates/root/Unsupported_Browser.html diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/browsercheck.css b/ansible/roles/ncr-web/templates/root/browsercheck.css similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/browsercheck.css rename to ansible/roles/ncr-web/templates/root/browsercheck.css diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/browsercheck.js b/ansible/roles/ncr-web/templates/root/browsercheck.js similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/browsercheck.js rename to ansible/roles/ncr-web/templates/root/browsercheck.js diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/index.jsp b/ansible/roles/ncr-web/templates/root/index.jsp similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/index.jsp rename to ansible/roles/ncr-web/templates/root/index.jsp diff --git a/ansible/roles/ncr-tomcat-admin/templates/root/keepalive.htm b/ansible/roles/ncr-web/templates/root/keepalive.htm similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/root/keepalive.htm rename to ansible/roles/ncr-web/templates/root/keepalive.htm diff --git a/ansible/roles/ncr-tomcat-admin/templates/server.xml b/ansible/roles/ncr-web/templates/server.xml similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/server.xml rename to ansible/roles/ncr-web/templates/server.xml diff --git a/ansible/roles/ncr-tomcat-admin/templates/setenv.sh b/ansible/roles/ncr-web/templates/setenv.sh similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/setenv.sh rename to ansible/roles/ncr-web/templates/setenv.sh diff --git a/ansible/roles/ncr-tomcat-admin/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh b/ansible/roles/ncr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh rename to ansible/roles/ncr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh diff --git a/ansible/roles/ncr-tomcat-admin/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini b/ansible/roles/ncr-web/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini rename to ansible/roles/ncr-web/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini diff --git a/ansible/roles/ncr-tomcat-admin/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini b/ansible/roles/ncr-web/templates/u02/software/BIP_4_3_SP1/web_response.ini similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini rename to ansible/roles/ncr-web/templates/u02/software/BIP_4_3_SP1/web_response.ini diff --git a/ansible/roles/ncr-tomcat-admin/templates/wdeploy.conf b/ansible/roles/ncr-web/templates/wdeploy.conf similarity index 100% rename from ansible/roles/ncr-tomcat-admin/templates/wdeploy.conf rename to ansible/roles/ncr-web/templates/wdeploy.conf From f6db394e342198624b31edd831ae7c496e54802c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Apr 2024 08:40:54 +0000 Subject: [PATCH 2/2] Commit changes made by code formatters --- ansible/roles/ncr-bip/tasks/main.yml | 1 - ansible/roles/ncr-web/tasks/main.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/roles/ncr-bip/tasks/main.yml b/ansible/roles/ncr-bip/tasks/main.yml index 220375160..67a832a2a 100644 --- a/ansible/roles/ncr-bip/tasks/main.yml +++ b/ansible/roles/ncr-bip/tasks/main.yml @@ -52,7 +52,6 @@ - amibuild - ec2provision when: ansible_distribution in ['RedHat'] - # - import_tasks: install_bip.yml # tags: # - amibuild diff --git a/ansible/roles/ncr-web/tasks/main.yml b/ansible/roles/ncr-web/tasks/main.yml index 499255251..6beffbb00 100644 --- a/ansible/roles/ncr-web/tasks/main.yml +++ b/ansible/roles/ncr-web/tasks/main.yml @@ -40,7 +40,6 @@ - amibuild - ec2provision when: ansible_distribution in ['RedHat'] - # - import_tasks: install_tomcat.yml # tags: # - amibuild