Feature/dsos 2464/combine patching and installation

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

ansible/roles/ncr-bip-cmc/tasks/get_facts.yml

@@ -7,12 +7,12 @@
 
 - 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:

ansible/roles/ncr-bip-cmc/tasks/install_bip_cmc.yml

@@ -9,11 +9,6 @@
     path: /u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
   register: bip_init_file_check
 
-- name: Check if init has been run
-  stat:
-    path: /etc/init.d/SAPBOBJEnterpriseXI40
-  register: setupinit_folder_check
-
 - name: Install BIP
   block:
     - name: Perform pre-requesite checks
@@ -40,4 +35,3 @@
       ansible.builtin.shell: /u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
   when:
     - bip_init_file_check.stat.exists
-    - not setupinit_folder_check.stat.exists

ansible/roles/ncr-bip-cmc/tasks/update_bip_cmc.yml

@@ -0,0 +1,19 @@
+---
+- name: Check if product is installed
+  stat:
+    path: /u01/app/bobj/BIP4/sap_bobj
+  register: bip_installed_check
+
+- name: Check if init file exists
+  stat:
+    path: /u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
+  register: bip_init_file_check
+
+- name: Update BIP
+  block:
+    - name: Run Silent Installation
+      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/cmc_response.ini
+  when: bip_installed_check.stat.exists