Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sap_swpm, sap_general_preconfigure: feat: add variables for sap_install FQCN collection name for calling roles #925

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions roles/sap_general_preconfigure/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ sap_general_preconfigure_system_roles_collection: 'fedora.linux_system_roles'
# - fedora.linux_system_roles
# - redhat.rhel_system_roles

sap_general_preconfigure_sap_install_collection: 'community.sap_install'
# Set which Ansible Collection to use for the sap_install.

sap_general_preconfigure_enable_repos: false
# Set to `true` if you want the role to enable the repos as configured by the following repo related parameters.
# The default is `false`, meaning that the role will not enable repos.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- name: Import role sap_maintain_etc_hosts
ansible.builtin.import_role:
name: 'community.sap_install.sap_maintain_etc_hosts'
name: '{{ sap_general_preconfigure_sap_install_collection }}.sap_maintain_etc_hosts'
vars:
sap_maintain_etc_hosts_list:
- node_ip: "{{ sap_general_preconfigure_ip }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- name: Import role sap_maintain_etc_hosts
ansible.builtin.import_role:
name: 'community.sap_install.sap_maintain_etc_hosts'
name: '{{ sap_general_preconfigure_sap_install_collection }}.sap_maintain_etc_hosts'
vars:
sap_maintain_etc_hosts_list:
- node_ip: "{{ sap_general_preconfigure_ip }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- name: Import role sap_maintain_etc_hosts
ansible.builtin.import_role:
name: 'community.sap_install.sap_maintain_etc_hosts'
name: '{{ sap_general_preconfigure_sap_install_collection }}.sap_maintain_etc_hosts'
vars:
sap_maintain_etc_hosts_list:
- node_ip: "{{ sap_general_preconfigure_ip }}"
Expand Down
3 changes: 3 additions & 0 deletions roles/sap_swpm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -449,3 +449,6 @@ sap_swpm_update_etchosts: false

# Display SAP SWPM Unattended Mode output (sapinst stdout)
sap_swpm_display_unattended_output: false

# Set which Ansible Collection to use for the sap_install.
sap_swpm_sap_install_collection: 'community.sap_install'
4 changes: 2 additions & 2 deletions roles/sap_swpm/tasks/pre_install/update_etchosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

- name: SAP SWPM Pre Install - Update '/etc/hosts' for NW
ansible.builtin.import_role:
name: 'community.sap_install.sap_maintain_etc_hosts'
name: '{{ sap_swpm_sap_install_collection }}.sap_maintain_etc_hosts'
vars:
sap_maintain_etc_hosts_list:
- node_ip: "{{ ansible_default_ipv4.address | d(ansible_all_ipv4_addresses[0]) }}"
Expand Down Expand Up @@ -46,7 +46,7 @@

- name: SAP SWPM Pre Install - Update '/etc/hosts' for HANA
ansible.builtin.import_role:
name: 'community.sap_install.sap_maintain_etc_hosts'
name: '{{ sap_swpm_sap_install_collection }}.sap_maintain_etc_hosts'
vars:
sap_maintain_etc_hosts_list:
- node_ip: "{{ sap_swpm_db_ip }}"
Expand Down
Loading