ncr: TM-534: bip fixes v2

ansible/group_vars/server_type_base_rhel85.yml

@@ -4,15 +4,18 @@ ansible_python_interpreter: python3.9
 server_type_roles_list:
   - autoscale-group-hooks
   - get-ec2-facts
+  - packages
   - sshd-config
   - users-and-groups
-  - set-ec2-hostname
-  - domain-search
+  # - set-ec2-hostname
+  # - domain-search
   - ansible-script
   - time
   - python-ssm-configure
   - autoscale-group-hooks-state
 
+packages_yum_update_on_build: []
+
 collectd_monitored_services_servertype:
   - metric_name: service_status_os
     metric_dimension: chronyd

ansible/group_vars/server_type_ncr_bip_app.yml

@@ -13,6 +13,8 @@ users_and_groups_system:
       - dba
       - sapsys
 
+set_ec2_hostname_mode: "short" # don't rename to tags.Name
+
 server_type_roles_list:
   - ansible-requirements
   - sshd-config
@@ -42,6 +44,7 @@ server_type_roles_list:
 
 roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}"
 
+packages_yum_update_on_build: []
 packages_yum_install:
   - bind-utils
   - nano

ansible/group_vars/server_type_ncr_bip_cms.yml

@@ -13,6 +13,8 @@ users_and_groups_system:
       - dba
       - sapsys
 
+set_ec2_hostname_mode: "short" # don't rename to tags.Name
+
 server_type_roles_list:
   - ansible-requirements
   - sshd-config
@@ -42,6 +44,7 @@ server_type_roles_list:
 
 roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}"
 
+packages_yum_update_on_build: []
 packages_yum_install:
   - bind-utils
   - nano

ansible/group_vars/server_type_ncr_web.yml

@@ -13,6 +13,8 @@ users_and_groups_system:
       - dba
       - sapsys
 
+set_ec2_hostname_mode: "short" # don't rename to tags.Name
+
 server_type_roles_list:
   - ansible-requirements
   - sshd-config
@@ -40,6 +42,7 @@ server_type_roles_list:
 
 roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}"
 
+packages_yum_update_on_build: []
 packages_yum_install:
   - bind-utils
   - nano

ansible/group_vars/server_type_ncr_webadmin.yml

@@ -13,6 +13,8 @@ users_and_groups_system:
       - dba
       - sapsys
 
+set_ec2_hostname_mode: "short" # don't rename to tags.Name
+
 server_type_roles_list:
   - ansible-requirements
   - sshd-config
@@ -40,6 +42,7 @@ server_type_roles_list:
 
 roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}"
 
+packages_yum_update_on_build: []
 packages_yum_install:
   - bind-utils
   - nano

ansible/roles/ncr-bip/defaults/main.yml

@@ -28,8 +28,8 @@ sap_bip_auditing_db_user: "{{ sap_bip_db_conf.auditing_db_user }}"
 sap_bip_cms_db_server: "{{ sap_bip_db_conf.cms_db_server }}"
 sap_bip_cms_db_user: "{{ sap_bip_db_conf.cms_db_user }}"
 sap_bip_cms_db_reset: 1
-sap_bip_sia_name_cms: "{{ ansible_ec2_hostname.split('.')[0] | replace('-','') }}"
-sap_bip_sia_name_app: "{{ ansible_ec2_hostname.split('.')[0] | replace('-','') }}"
+sap_bip_sia_name_cms: "{{ ec2.tags.Name | replace('-','') }}"
+sap_bip_sia_name_app: "{{ ec2.tags.Name | replace('-','') }}"
 
 # set in group vars, otherwise response.cms.ini or response.app.ini is used depending on whether first install
 # sap_bip_responsefile:

ansible/roles/ncr-bip/tasks/update_secrets.yml

@@ -5,7 +5,7 @@
   vars:
     secretsmanager_passwords:
       config:
-        secret: "/ec2/ncr-bip/{{ ncr_environment }}/config"
+        secret: "{{ sap_bip_secretsmanager_passwords.config.secret }}"
         users:
           - cms_primary_hostname: "{{ sap_bip_cms_primary_hostname }}"
           - cms_hosts: "{{ sap_bip_cms_hosts }}"

ansible/roles/ncr-bip/templates/home/bobj/.bash_profile

@@ -8,6 +8,7 @@ fi
 # User specific environment and startup programs
 
 export EDITOR=vi
+export PS1="[\u@\h {{ ec2.tags['Name'] }} \W]\$ "
 
 # Oracle setup
 export ORACLE_HOME={{ oracle_home }}

ansible/roles/set-ec2-hostname/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
 # dns_zone_internal: set in environment specific group_vars
+set_ec2_hostname_mode: "auto" # or tags.Name or short

ansible/roles/set-ec2-hostname/tasks/set-ec2-hostname.yml

@@ -18,13 +18,15 @@
   set_fact:
     ec2_hostname_fqdn: "{{ ec2.tags.Name }}.{{ dns_zone_internal }}"
     ec2_hostname_short: "{{ ec2.tags.Name }}"
-  when: ansible_ec2_autoscaling_target_lifecycle_state is not defined
+  when:
+    - set_ec2_hostname_mode == "tags.Name" or (set_ec2_hostname_mode == "auto" and ansible_ec2_autoscaling_target_lifecycle_state is not defined)
 
 - name: Set hostname to the dns name
   set_fact:
     ec2_hostname_fqdn: "{{ ansible_ec2_hostname }}"
     ec2_hostname_short: "{{ ansible_ec2_hostname.split('.')[0] }}"
-  when: ansible_ec2_autoscaling_target_lifecycle_state is defined
+  when:
+    - set_ec2_hostname_mode == "short" or (set_ec2_hostname_mode == "auto" and ansible_ec2_autoscaling_target_lifecycle_state is defined)
 
 - name: Configure /etc/hosts
   ansible.builtin.template:
@@ -45,7 +47,7 @@
 - name: Get hostname RHEL6
   ansible.builtin.shell: |
     hostname
-  check_mode: no
+  check_mode: false
   changed_when: false
   register: rhel6_hostname
   when: ansible_distribution_major_version == '6'