Use custom admin user in qe-sap-deployment

Author: BillAnastasiadis

README.md

@@ -235,7 +235,7 @@ TF_LOG_PATH=terraform.apply.log TF_LOG=INFO terraform apply -auto-approve plan.z
 
 Terraform also generate the Ansible inventory file **inventory.yaml**
 
-Test the inventory by pinging all hosts
+Test the inventory by pinging all hosts (if using custom admin user, replace "cloudadmin")
 
 ```shell
 ansible -i inventory.yaml all -m ping --ssh-extra-args="-o UpdateHostKeys=yes -o StrictHostKeyChecking=accept-new -i <SECRET_FOLDER>/id_rsa_cloud" -u cloudadmin

ansible/playbooks/additional_fence_agent_tasks.yaml

@@ -1,7 +1,6 @@
 ---
 - name: PTF Installation
   hosts: hana
-  remote_user: cloudadmin
   become: true
   become_user: root
 

ansible/playbooks/cluster_sbd_prep.yaml

@@ -1,7 +1,6 @@
 ---
 - name: Cluster SBD preparation
   hosts: iscsi, hana
-  remote_user: cloudadmin
   become: true
   become_user: root
   pre_tasks:

ansible/playbooks/deregister.yaml

@@ -1,7 +1,6 @@
 ---
 - name: Deregister
   hosts: all
-  remote_user: cloudadmin
   become: true
   become_user: root
 

ansible/playbooks/fully-patch-system.yaml

@@ -1,7 +1,6 @@
 ---
 - name: Fully patch playbookhosts
   hosts: all
-  remote_user: cloudadmin
   become: true
   become_user: root
   vars:

ansible/playbooks/hana_prevalidate.yaml

@@ -2,6 +2,5 @@
 - name: SAP HANA site failure test
   hosts: "{{ node_name | default('no_host_provided')}}"
   gather_facts: false
-  remote_user: cloudadmin
   roles:
     - hana_prevalidate

ansible/playbooks/hana_sr_takeover.yaml

@@ -2,7 +2,6 @@
 - name: SAP HANA takeover – disruptive node
   hosts: "{{ node_name | default('no_host_provided')}}"
   gather_facts: false
-  remote_user: cloudadmin
   vars_files:
     - "{{ playbook_dir }}/vars/test_vars.yaml"
     - "{{ playbook_dir }}/vars/hana_vars.yaml"
@@ -14,7 +13,6 @@
 - name: SAP HANA takeover – cluster validation
   hosts: hana
   gather_facts: false
-  remote_user: cloudadmin
   serial: 1
   vars_files:
     - "{{ playbook_dir }}/vars/test_vars.yaml"

ansible/playbooks/hana_sr_test_secondary.yaml

@@ -2,7 +2,6 @@
 - name: SAP HANA secondary-site failure test
   hosts: "{{ node_name | default('no_host_provided')}}"
   gather_facts: false
-  remote_user: cloudadmin
   vars_files:
     - "{{ playbook_dir }}/vars/test_vars.yaml"
     - "{{ playbook_dir }}/vars/hana_vars.yaml"

ansible/playbooks/ibsm.yaml

@@ -1,7 +1,6 @@
 ---
 - name: IBSM
   hosts: all
-  remote_user: cloudadmin
   become: true
   become_user: root
 

ansible/playbooks/pre-cluster.yaml

@@ -1,7 +1,6 @@
 ---
 - name: Cluster preparation
   hosts: all
-  remote_user: cloudadmin
   vars:
     crm_rootless: false
   pre_tasks:
@@ -32,7 +31,7 @@
         mode: '0700'
       when: inventory_hostname in groups.hana
 
-    - name: Ensure that /home/cloudadmin/.ssh exists on hana
+    - name: Ensure that /home/<admin_user>/.ssh exists on hana
       ansible.builtin.file:
         path: "{{ ansible_env.HOME }}/.ssh"
         state: directory
@@ -56,7 +55,7 @@
       register: ssh_root_keys
       when: inventory_hostname in groups.hana
 
-    - name: Generate public/private keys for cloudadmin on hana hosts
+    - name: Generate public/private keys for <admin_user> on hana hosts
       community.crypto.openssh_keypair:
         owner: "{{ ansible_user }}"
         group: users
@@ -81,7 +80,7 @@
         loop_var: idx
       when: inventory_hostname in groups.hana
 
-    - name: Apply cloudadmin pub key to other node cloudadmin Authorised Keys
+    - name: Apply <admin_user> pub key to other node <admin_user> Authorised Keys
       ansible.posix.authorized_key:
         user: "{{ ansible_user }}"
         state: present