Merge pull request #455 from ministryofjustice/feature/DSOS-2464/comb…

…ine-patching-and-installation Removed outdated patching roles
ministryofjustice · Dec 20, 2023 · 6c6c077 · 6c6c077
2 parents 10c06f9 + 873f747
commit 6c6c077
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 189 deletions.
diff --git a/ansible/group_vars/server_type_ncr_bip_cmc.yml b/ansible/group_vars/server_type_ncr_bip_cmc.yml
@@ -14,23 +14,23 @@ users_and_groups_system:
       - 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
+  # - 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-cmc
   - collectd
   - amazon-cloudwatch-agent

diff --git a/ansible/roles/ncr-bip-cmc-patching/defaults/main.yml b/ansible/roles/ncr-bip-cmc-patching/defaults/main.yml
diff --git a/ansible/roles/ncr-bip-cmc-patching/meta/main.yml b/ansible/roles/ncr-bip-cmc-patching/meta/main.yml
diff --git a/ansible/roles/ncr-bip-cmc-patching/tasks/main.yml b/ansible/roles/ncr-bip-cmc-patching/tasks/main.yml
diff --git a/ansible/roles/ncr-bip-cmc-patching/templates/.gitkeep b/ansible/roles/ncr-bip-cmc-patching/templates/.gitkeep
diff --git a/ansible/roles/ncr-bip-cmc/defaults/main.yml b/ansible/roles/ncr-bip-cmc/defaults/main.yml
@@ -5,6 +5,8 @@ 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
 
+nomis-combined-reporting-environment: "{{ ec2.tags['nomis-combined-reporting-environment'] }}"
+
 s3:
   bip_bucket_name: nomis-combined-reporting-bip-packages20230612143115114600000001
   packages_prefix: BIP/
@@ -20,12 +22,6 @@ ssm_parameters_prefix: "bip-cmc"
 
 bip_cmc_secretsmanager_passwords:
   bip_cmc:
-    account_name: "nomis-combined-reporting-{{ aws_environment }}"
-    secret: "/t1-ncr-bip-cmc/passwords"
+    secret: "/ec2/ncr-bip-cmc/t1/passwords"
     users:
-      - cms_cluster_key:
-      - cms_admin_password:
-      - cms_db_password:
-      - lcm_password:
-      - product_key:
-      - auditing_db_password:
+      - bip_cmc: auto
diff --git a/ansible/roles/ncr-bip-cmc/tasks/get_facts.yml b/ansible/roles/ncr-bip-cmc/tasks/get_facts.yml
@@ -7,9 +7,25 @@
 
 - name: Set password facts
   set_fact:
-    cms_cluster_key: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['cms_cluster_key'] }}"
-    cms_admin_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['cms_admin_password'] }}"
-    cms_db_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['cms_db_password'] }}"
-    lcm_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['lcm_password'] }}"
-    product_key: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['product_key'] }}"
-    auditing_db_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords['auditing_db_password'] }}"
+    cms_cluster_key: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[cms_cluster_key] }}"
+    cms_admin_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[cms_admin_password] }}"
+    cms_db_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[cms_db_password] }}"
+    lcm_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[lcm_password] }}"
+    product_key: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[product_key] }}"
+    auditing_db_password: "{{ secretsmanager_passwords_dict['bip_cmc'].passwords[auditing_db_password] }}"
+
+- name: Check all SSM parameters and tags are set
+  set_fact:
+    bip_cmc_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_cmc_all_variables_set|default(false)
diff --git a/ansible/roles/ncr-bip-patching/defaults/main.yml b/ansible/roles/ncr-bip-patching/defaults/main.yml
diff --git a/ansible/roles/ncr-bip-patching/meta/main.yml b/ansible/roles/ncr-bip-patching/meta/main.yml
diff --git a/ansible/roles/ncr-bip-patching/tasks/main.yml b/ansible/roles/ncr-bip-patching/tasks/main.yml
diff --git a/ansible/roles/ncr-bip-patching/templates/.gitkeep b/ansible/roles/ncr-bip-patching/templates/.gitkeep
diff --git a/ansible/roles/ncr-tomcat-patching/defaults/main.yml b/ansible/roles/ncr-tomcat-patching/defaults/main.yml
diff --git a/ansible/roles/ncr-tomcat-patching/meta/main.yml b/ansible/roles/ncr-tomcat-patching/meta/main.yml
diff --git a/ansible/roles/ncr-tomcat-patching/tasks/add_response_file.yml b/ansible/roles/ncr-tomcat-patching/tasks/add_response_file.yml
diff --git a/ansible/roles/ncr-tomcat-patching/tasks/main.yml b/ansible/roles/ncr-tomcat-patching/tasks/main.yml
diff --git a/ansible/roles/ncr-tomcat-patching/tasks/patch_tomcat.yml b/ansible/roles/ncr-tomcat-patching/tasks/patch_tomcat.yml
diff --git a/ansible/roles/ncr-tomcat-patching/tasks/post_patching.yml b/ansible/roles/ncr-tomcat-patching/tasks/post_patching.yml
diff --git a/ansible/roles/ncr-tomcat-patching/templates/.gitkeep b/ansible/roles/ncr-tomcat-patching/templates/.gitkeep