Merge pull request #18 from sap-linuxlab/dev

fix: cleanup file structure

Author: sean-freeman

all/ansible_sap_ecc_hana_system_copy_hdb/ansible_playbook.yml

@@ -3,37 +3,25 @@
   hosts: all
   become: true
 
-  vars:
-    sap_hostname: "{{ ansible_hostname }}"
-    sap_domain: "{{ ansible_domain }}"
-    sap_ip: "{{ ansible_default_ipv4.address }}"
-    sap_general_preconfigure_modify_etc_hosts: false
-    sap_general_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_update: yes
-    sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: no
-
-  collections:
-    - community.general
-    - community.sap_launchpad
-
 # Use include_role inside Task block, instead of using roles declaration or Task block with import_roles.
 # This ensures Ansible Roles, and the tasks within, will be parsed in sequence instead of parsing at Playbook initialisation
   tasks:
 
+    # Set facts based on the install dictionary and the default template selected
     - name: Set fact x86_64 softwarecenter_search_list_ecc_syscopy
       set_fact:
-        softwarecenter_search_list_ecc_syscopy: "{{ softwarecenter_search_list_ecc_syscopy_x86_64 }}"
+        softwarecenter_search_list_ecc_syscopy: "{{ sap_swpm_templates_install_dictionary[sap_swpm_templates_product_input]['softwarecenter_search_list_x86_64'] }}"
       when:
         - ansible_architecture == "x86_64"
 
+    # Set facts based on the install dictionary and the default template selected
     - name: Set fact ppc64le softwarecenter_search_list_ecc_syscopy
       set_fact:
-        softwarecenter_search_list_ecc_syscopy: "{{ softwarecenter_search_list_ecc_syscopy_ppc64le }}"
+        softwarecenter_search_list_ecc_syscopy: "{{ sap_swpm_templates_install_dictionary[sap_swpm_templates_product_input]['softwarecenter_search_list_ppc64le'] }}"
       when:
         - ansible_architecture == "ppc64le"
 
-    - name: update etc hosts
+    - name: Update etc hosts
       lineinfile:
         dest: /etc/hosts
         line: "{{ ansible_default_ipv4.address }}\t{{ ansible_hostname }}.{{ ansible_domain }}\t{{ ansible_hostname }}"

all/ansible_sap_ecc_hana_system_copy_hdb/ansible_playbook_dry_run.yml

@@ -26,7 +26,8 @@
         softwarecenter_search_query: "{{ item }}"
         dest: "{{ playbook_dir }}"
         dry_run: True
-      with_items: "{{ softwarecenter_search_list_ecc_syscopy_x86_64 }}"
+      with_items:
+        - "{{ sap_swpm_templates_install_dictionary[sap_swpm_templates_product_input]['softwarecenter_search_list_x86_64'] }}"
       when:
         - dry_run_test == "x86_64"
 #      vars:
@@ -40,7 +41,8 @@
         softwarecenter_search_query: "{{ item }}"
         dest: "{{ playbook_dir }}"
         dry_run: True
-      with_items: "{{ softwarecenter_search_list_ecc_syscopy_ppc64le }}"
+      with_items:
+        - "{{ sap_swpm_templates_install_dictionary[sap_swpm_templates_product_input]['softwarecenter_search_list_ppc64le'] }}"
       when:
         - dry_run_test == "ppc64le"
 #      vars:

all/ansible_sap_ecc_hana_system_copy_hdb/create_ansible_extravars.tf

@@ -4,44 +4,41 @@ resource "local_file" "ansible_extravars" {
   filename        = "${path.root}/tmp/${var.module_var_hostname}/ansible_vars.yml"
   file_permission = "0755"
   content         = <<EOF
+
+# ---- Mandatory parameters : Ansible Defaults ---- #
+
 #ansible_python_interpreter: python3
 
-dry_run_test: "${var.module_var_dry_run_test}"
+# Default Ansible Facts populate into default variables for all Ansible Roles
+sap_hostname: "{{ ansible_hostname }}"
+sap_domain: "{{ ansible_domain }}"
+sap_ip: "{{ ansible_default_ipv4.address }}"
 
-sap_swpm_ansible_role_mode: default_templates
-sap_swpm_templates_product_input: "${var.module_var_sap_swpm_template_selected}"
 
+
+# ---- Mandatory parameters : Preconfigure OS for SAP Software ---- #
+
+# Configuration of Ansible Roles for preconfigure SAP (general, hana, netweaver)
+sap_general_preconfigure_modify_etc_hosts: false
+sap_general_preconfigure_reboot_ok: no
+sap_general_preconfigure_fail_if_reboot_required: no
+sap_hana_preconfigure_reboot_ok: yes
+sap_hana_preconfigure_fail_if_reboot_required: no
+sap_hana_preconfigure_update: yes
+sap_hana_update_etchosts: yes
+sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: no
+
+
+
+# ---- Mandatory parameters : SAP Software installation media downloads ---- #
+
+dry_run_test: "${var.module_var_dry_run_test}"
+
+# SAP ONE Support Launchpad credentials
 suser_id: "${var.module_var_sap_id_user}"
 suser_password: '${var.module_var_sap_id_user_password}'
 
-softwarecenter_search_list_ecc_syscopy_x86_64:
-  - 'SAPCAR_1115-70006178.EXE'
-  - 'IMDB_SERVER20_059_4-80002031.SAR'
-  - 'IMDB_LCAPPS_2059_0-20010426.SAR'
-  - 'IMDB_AFL20_059_0-80001894.SAR'
-  - 'VCH202000_2059_0-80005463.SAR'
-  - 'SWPM10SP35_6-20009701.SAR'
-  - 'igsexe_12-80003187.sar' # IGS 7.53
-  - 'igshelper_17-10010245.sar'
-  - 'SAPEXE_800-80002573.SAR' # Kernel Part I (753)
-  - 'SAPEXEDB_800-80002572.SAR' # Kernel Part II (753)
-  - 'IMDB_CLIENT20_007_26-80002082.SAR'
-  - 'SAPHOSTAGENT51_51-20009394.SAR'
-
-softwarecenter_search_list_ecc_syscopy_ppc64le:
-  - 'SAPCAR_1115-70006238.EXE'
-  - 'IMDB_SERVER20_059_4-80002046.SAR'
-  - 'IMDB_LCAPPS_2059_0-80002183.SAR'
-  - 'IMDB_AFL20_059_0-80002045.SAR'
-  - 'VCH202000_2059_0-80005464.SAR'
-  - 'SWPM10SP35_6-70002492.SAR'
-  - 'igsexe_12-80003246.sar' # IGS 7.53
-  - 'igshelper_17-10010245.sar'
-  - 'SAPEXE_800-80002630.SAR' # Kernel Part I (753)
-  - 'SAPEXEDB_800-80002629.SAR' # Kernel Part II (753)
-  - 'IMDB_CLIENT20_007_26-80002095.SAR'
-  - 'SAPHOSTAGENT51_51-70002261.SAR'
-
+# Directory for SAP installation media
 sap_install_media_detect_directory: "${var.module_var_sap_software_download_directory}"
 
 
@@ -93,6 +90,12 @@ sap_hana_install_update_etchosts: 'false'
 
 
 
+# ------ Mandatory parameters : SAP SWPM installation using Defaults Templates mode of the Ansible Role ------ #
+
+sap_swpm_ansible_role_mode: default_templates
+sap_swpm_templates_product_input: "${var.module_var_sap_swpm_template_selected}"
+
+
 # ------ Mandatory parameters : SAP SWPM installation using Defaults Templates mode of the Ansible Role ------ #
 
 # Override any variable set in sap_swpm_inifile_dictionary
@@ -112,19 +115,9 @@ sap_swpm_db_sidadm_password: "${var.module_var_sap_swpm_db_sidadm_password}"
 sap_swpm_templates_install_dictionary:
 
   sap_ecc6_ehp8_hana_onehost_system_copy:
+
     sap_swpm_product_catalog_id: NW_ABAP_OneHost:BS2016.ERP608.HDB.CP
-    sap_swpm_inifile_list:
-    - installation_media
-    - installation_media_swpm1
-    - credentials
-    - db_hana_config
-    - db_hana_restore
-    - db_hana_nw_connection
-    - nw_other_config
-    - nw_central_instance
-    - nw_instance_config
-    - nw_ports_config
-    - unix_user
+
     sap_swpm_inifile_dictionary:
       sap_swpm_sid: "${var.module_var_sap_swpm_sid}"
       sap_swpm_pas_instance_nr: "${var.module_var_sap_swpm_pas_instance_nr}"
@@ -142,20 +135,52 @@ sap_swpm_templates_install_dictionary:
       #sap_swpm_cd_rdms_path:
       sap_swpm_load_type: HBR
 
+    sap_swpm_inifile_list:
+      - installation_media
+      - installation_media_swpm1
+      - credentials
+      - db_hana_config
+      - db_hana_restore
+      - db_hana_nw_connection
+      - nw_other_config
+      - nw_central_instance
+      - nw_instance_config
+      - nw_ports_config
+      - unix_user
+
+    softwarecenter_search_list_x86_64:
+      - 'SAPCAR_1115-70006178.EXE'
+      - 'IMDB_SERVER20_059_5-80002031.SAR'
+      - 'IMDB_LCAPPS_2059_0-20010426.SAR'
+      - 'IMDB_AFL20_059_0-80001894.SAR'
+      - 'VCH202000_2059_0-80005463.SAR'
+      - 'SWPM10SP35_7-20009701.SAR'
+      - 'igsexe_12-80003187.sar' # IGS 7.53
+      - 'igshelper_17-10010245.sar'
+      - 'SAPEXE_800-80002573.SAR' # Kernel Part I (753)
+      - 'SAPEXEDB_800-80002572.SAR' # Kernel Part II (753)
+      - 'IMDB_CLIENT20_007_26-80002082.SAR'
+      - 'SAPHOSTAGENT51_51-20009394.SAR'
+
+    softwarecenter_search_list_pc64le:
+      - 'SAPCAR_1115-70006238.EXE'
+      - 'IMDB_SERVER20_059_5-80002046.SAR'
+      - 'IMDB_LCAPPS_2059_0-80002183.SAR'
+      - 'IMDB_AFL20_059_0-80002045.SAR'
+      - 'VCH202000_2059_0-80005464.SAR'
+      - 'SWPM10SP35_7-70002492.SAR'
+      - 'igsexe_12-80003246.sar' # IGS 7.53
+      - 'igshelper_17-10010245.sar'
+      - 'SAPEXE_800-80002630.SAR' # Kernel Part I (753)
+      - 'SAPEXEDB_800-80002629.SAR' # Kernel Part II (753)
+      - 'IMDB_CLIENT20_007_26-80002095.SAR'
+      - 'SAPHOSTAGENT51_51-70002261.SAR'
+
+
   sap_ecc6_ehp7_hana_onehost_system_copy:
+
     sap_swpm_product_catalog_id: NW_ABAP_OneHost:BS2013SR2.ERP607SR2.HDB.CP
-    sap_swpm_inifile_list:
-    - installation_media
-    - installation_media_swpm1
-    - credentials
-    - db_hana_config
-    - db_hana_restore
-    - db_hana_nw_connection
-    - nw_other_config
-    - nw_central_instance
-    - nw_instance_config
-    - nw_ports_config
-    - unix_user
+
     sap_swpm_inifile_dictionary:
       sap_swpm_sid: "${var.module_var_sap_swpm_sid}"
       sap_swpm_pas_instance_nr: "${var.module_var_sap_swpm_pas_instance_nr}"
@@ -173,6 +198,46 @@ sap_swpm_templates_install_dictionary:
       #sap_swpm_cd_rdms_path:
       sap_swpm_load_type: HBR
 
+    sap_swpm_inifile_list:
+      - installation_media
+      - installation_media_swpm1
+      - credentials
+      - db_hana_config
+      - db_hana_restore
+      - db_hana_nw_connection
+      - nw_other_config
+      - nw_central_instance
+      - nw_instance_config
+      - nw_ports_config
+      - unix_user
+
+    softwarecenter_search_list_x86_64:
+      - 'SAPCAR_1115-70006178.EXE'
+      - 'IMDB_SERVER20_059_5-80002031.SAR'
+      - 'IMDB_LCAPPS_2059_0-20010426.SAR'
+      - 'IMDB_AFL20_059_0-80001894.SAR'
+      - 'VCH202000_2059_0-80005463.SAR'
+      - 'SWPM10SP35_7-20009701.SAR'
+      - 'igsexe_12-80003187.sar' # IGS 7.53
+      - 'igshelper_17-10010245.sar'
+      - 'SAPEXE_800-80002573.SAR' # Kernel Part I (753)
+      - 'SAPEXEDB_800-80002572.SAR' # Kernel Part II (753)
+      - 'IMDB_CLIENT20_007_26-80002082.SAR'
+      - 'SAPHOSTAGENT51_51-20009394.SAR'
+
+    softwarecenter_search_list_pc64le:
+      - 'SAPCAR_1115-70006238.EXE'
+      - 'IMDB_SERVER20_059_5-80002046.SAR'
+      - 'IMDB_LCAPPS_2059_0-80002183.SAR'
+      - 'IMDB_AFL20_059_0-80002045.SAR'
+      - 'VCH202000_2059_0-80005464.SAR'
+      - 'SWPM10SP35_7-70002492.SAR'
+      - 'igsexe_12-80003246.sar' # IGS 7.53
+      - 'igshelper_17-10010245.sar'
+      - 'SAPEXE_800-80002630.SAR' # Kernel Part I (753)
+      - 'SAPEXEDB_800-80002629.SAR' # Kernel Part II (753)
+      - 'IMDB_CLIENT20_007_26-80002095.SAR'
+      - 'SAPHOSTAGENT51_51-70002261.SAR'
 
 EOF
 }

all/ansible_sap_hana_install/ansible_playbook.yml

@@ -3,20 +3,6 @@
   hosts: all
   become: true
 
-  vars:
-    sap_hostname: "{{ ansible_hostname }}"
-    sap_domain: "{{ ansible_domain }}"
-    sap_ip: "{{ ansible_default_ipv4.address }}"
-    sap_general_preconfigure_modify_etc_hosts: false
-    sap_general_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_update: yes
-    sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: no
-
-  collections:
-    - community.general
-    - community.sap_launchpad
-
 # Use include_role inside Task block, instead of using roles declaration or Task block with import_roles.
 # This ensures Ansible Roles, and the tasks within, will be parsed in sequence instead of parsing at Playbook initialisation
   tasks:
@@ -33,7 +19,7 @@
       when:
         - ansible_architecture == "ppc64le"
 
-    - name: update etc hosts
+    - name: Update etc hosts
       lineinfile:
         dest: /etc/hosts
         line: "{{ ansible_default_ipv4.address }}\t{{ ansible_hostname }}.{{ ansible_domain }}\t{{ ansible_hostname }}"

all/ansible_sap_hana_install/create_ansible_extravars.tf

@@ -5,8 +5,35 @@ resource "local_file" "ansible_extravars" {
   file_permission = "0755"
   content         = <<EOF
 
+# ---- Mandatory parameters : Ansible Defaults ---- #
+
+#ansible_python_interpreter: python3
+
+# Default Ansible Facts populate into default variables for all Ansible Roles
+sap_hostname: "{{ ansible_hostname }}"
+sap_domain: "{{ ansible_domain }}"
+sap_ip: "{{ ansible_default_ipv4.address }}"
+
+
+
+# ---- Mandatory parameters : Preconfigure OS for SAP Software ---- #
+
+# Configuration of Ansible Roles for preconfigure SAP (general, hana, netweaver)
+sap_general_preconfigure_modify_etc_hosts: false
+sap_general_preconfigure_reboot_ok: no
+sap_general_preconfigure_fail_if_reboot_required: no
+sap_hana_preconfigure_reboot_ok: yes
+sap_hana_preconfigure_fail_if_reboot_required: no
+sap_hana_preconfigure_update: yes
+sap_hana_update_etchosts: yes
+
+
+
+# ---- Mandatory parameters : SAP Software installation media downloads ---- #
+
 dry_run_test: "${var.module_var_dry_run_test}"
 
+# SAP ONE Support Launchpad credentials
 suser_id: "${var.module_var_sap_id_user}"
 suser_password: '${var.module_var_sap_id_user_password}'
 
@@ -23,8 +50,6 @@ softwarecenter_search_list_saphana_ppc64le:
   - 'IMDB_AFL20_061_2-80002045.SAR'
 
 
-#ansible_python_interpreter: python3
-
 
 # ------ Mandatory parameters : SAP HANA installation ------ #
 
@@ -43,6 +68,7 @@ sap_hana_install_sid: "${var.module_var_sap_hana_install_sid}"
 sap_hana_install_instance_number: "${var.module_var_sap_hana_install_instance_number}"
 
 
+
 # ------ Optional parameters : SAP HANA installation ------ #
 
 # List of components to be installed, default 'all'

all/ansible_sap_s4hana_install_maintplan/ansible_playbook.yml

@@ -3,20 +3,6 @@
   hosts: all
   become: true
 
-  vars:
-    sap_hostname: "{{ ansible_hostname }}"
-    sap_domain: "{{ ansible_domain }}"
-    sap_ip: "{{ ansible_default_ipv4.address }}"
-    sap_general_preconfigure_modify_etc_hosts: false
-    sap_general_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_fail_if_reboot_required: no
-    sap_hana_preconfigure_update: yes
-    sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: no
-
-  collections:
-    - community.general
-    - community.sap_launchpad
-
 # Use include_role inside Task block, instead of using roles declaration or Task block with import_roles.
 # This ensures Ansible Roles, and the tasks within, will be parsed in sequence instead of parsing at Playbook initialisation
   tasks:
@@ -33,7 +19,7 @@
       when:
         - ansible_architecture == "ppc64le"
 
-    - name: update etc hosts
+    - name: Update etc hosts
       lineinfile:
         dest: /etc/hosts
         line: "{{ ansible_default_ipv4.address }}\t{{ ansible_hostname }}.{{ ansible_domain }}\t{{ ansible_hostname }}"