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

Name all tasks #133

Merged
merged 1 commit into from Jun 28, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions roles/jws/tasks/apply_cp.yml
Expand Up @@ -8,14 +8,16 @@
quiet: true
fail_msg: "One or more required parameters for cumulative patch application is missing."

- ansible.builtin.set_fact:
- name: "Set native zipfile when distribution data available"
ansible.builtin.set_fact:
patch_native_bundle: "jws-{{ jws.rhn_ids[jws_version].latest_cp.v | default('') }}-application-server-RHEL{{ ansible_facts['distribution_major_version'] }}-x86_64.zip"
when:
- jws_version is defined
- ansible_facts is defined
- ansible_facts['distribution_major_version'] is defined

- ansible.builtin.set_fact:
- name: "Set native zipfile when distribution data unavailable"
ansible.builtin.set_fact:
patch_native_bundle: "{{ tomcat.rhn.patch_native_bundle }}"
when:
- jws_version is defined
Expand Down Expand Up @@ -118,7 +120,8 @@
path: "{{ patch_archive }}"
register: patch_info

- ansible.builtin.set_fact:
- name: "Set patch checksum"
ansible.builtin.set_fact:
patch_checksum_file: "{{ tomcat.home }}/../.applied_patch_checksum_{{ patch_info.stat.checksum }}.txt"
when:
- patch_info is defined
Expand Down
18 changes: 12 additions & 6 deletions roles/jws/tasks/install.yml
Expand Up @@ -8,25 +8,31 @@
quiet: true
fail_msg: "{{ tomcat.install_method }} does not exist or is not supported. Supported methods are: {{ tomcat.supported_install_method }}"

- ansible.builtin.debug:
- name: "Display install method"
ansible.builtin.debug:
msg: "Install method: {{ tomcat.install_method }}"

- ansible.builtin.include_tasks: install/rhn.yml
- name: "Include installation tasks for rhn_zipfiles method"
ansible.builtin.include_tasks: install/rhn.yml
when:
- tomcat.install_method == 'rhn_zipfiles'

- ansible.builtin.include_tasks: install/url.yml
- name: "Include installation tasks for zipfiles method"
ansible.builtin.include_tasks: install/url.yml
when:
- tomcat.install_method == 'zipfiles'

- ansible.builtin.include_tasks: install/local.yml
- name: "Include installation tasks for local_zipfiles method"
ansible.builtin.include_tasks: install/local.yml
when:
- tomcat.install_method == 'local_zipfiles'

- ansible.builtin.include_tasks: install/zipfiles.yml
- name: "Include installation tasks for zip operations"
ansible.builtin.include_tasks: install/zipfiles.yml
when:
- tomcat.install_method != 'rpm'

- ansible.builtin.include_tasks: install/rpm.yml
- name: "Include installation tasks for rpm method"
ansible.builtin.include_tasks: install/rpm.yml
when:
- tomcat.install_method == 'rpm'
12 changes: 8 additions & 4 deletions roles/jws/tasks/install/rhn.yml
Expand Up @@ -7,12 +7,14 @@
quiet: true
fail_msg: "You need to provide"

- ansible.builtin.set_fact:
- name: Set filename for JWS zipfile
ansible.builtin.set_fact:
tomcat_zipfile: "jws-{{ jws_version }}-application-server.zip"
when:
- jws_version is defined

- ansible.builtin.set_fact:
- name: Set filename for JWS native zipfile
ansible.builtin.set_fact:
native_zipfile: "jws-{{ jws_version }}-application-server-RHEL{{ ansible_facts['distribution_major_version'] }}-x86_64.zip"
when:
- tomcat_native is defined
Expand All @@ -21,15 +23,17 @@
- ansible_facts is defined
- ansible_facts['distribution_major_version'] is defined

- ansible.builtin.include_tasks: fetch_zipfile_from_rhn_and_deploy.yml
- name: "Include fetch and unarchive from RHN tasks"
ansible.builtin.include_tasks: fetch_zipfile_from_rhn_and_deploy.yml
vars:
zipfile: "{{ tomcat_zipfile }}"
zipfile_url: "{{ tomcat.rhn.server_zipfile_url }}"
path_to_zipfile: "{{ tomcat_install_dir }}/{{ tomcat_zipfile }}"
when:
- tomcat_zipfile is defined

- ansible.builtin.include_tasks: fetch_zipfile_from_rhn_and_deploy.yml
- name: "Include fetch and unarchive from RHN tasks"
ansible.builtin.include_tasks: fetch_zipfile_from_rhn_and_deploy.yml
vars:
zipfile: "{{ native_zipfile }}"
zipfile_url: "{{ tomcat.rhn.server_zipfile_url }}"
Expand Down
9 changes: 4 additions & 5 deletions roles/jws/tasks/install/rpm.yml
Expand Up @@ -7,9 +7,6 @@
quiet: true
fail_msg: "No RPM package name provided."

- ansible.builtin.debug:
var: dnf_command

- name: "Verify distribution"
ansible.builtin.assert:
that:
Expand All @@ -27,13 +24,15 @@
quiet: true
fail_msg: "{{ tomcat.service.hr_name }} HOME does not match the one provided by RPM."

- ansible.builtin.set_fact:
- name: "Set dnf command for RPM installation"
ansible.builtin.set_fact:
dnf_command: "'groupinstall'"
info_msg: "install {{ tomcat.rpm }}"
when:
- not dnf_command is defined

- ansible.builtin.set_fact:
- name: "Set dnf command for RPM uninstall"
ansible.builtin.set_fact:
info_msg: "remove {{ tomcat.rpm }}"
when:
- dnf_command is defined
Expand Down
6 changes: 4 additions & 2 deletions roles/jws/tasks/install/zipfiles.yml
Expand Up @@ -7,11 +7,13 @@
quiet: true
fail_msg: "With {{ tomcat.install_method }} install method, 'tomcat_zipfile' needs to be defined (or at least jws_version)"

- ansible.builtin.set_fact:
- name: Add zipfile to unarchive list
ansible.builtin.set_fact:
zipfiles:
- { src: "{{ tomcat_zipfile }}", creates: "{{ tomcat.home }}/bin" }

- ansible.builtin.set_fact:
- name: Add native zipfile to unarchive list
ansible.builtin.set_fact:
zipfiles: "{{ zipfiles + [{ 'src': tomcat_native_zipfile, 'creates': tomcat.home + '/lib/libtcnative-1.so' }] }}"
when:
- tomcat_native
Expand Down
18 changes: 12 additions & 6 deletions roles/jws/tasks/main.yml
Expand Up @@ -20,7 +20,8 @@
name: tomcatjss
state: absent

- ansible.builtin.include_tasks: java_install.yml
- name: "Include tasks for java jvm installation"
ansible.builtin.include_tasks: java_install.yml
when: tomcat_java_version is defined

- name: Check user/groups and whether force install needed
Expand Down Expand Up @@ -71,11 +72,13 @@
- tomcat.install_method is defined
- tomcat.install_method != "rpm"

- ansible.builtin.include_tasks: install.yml
- name: "Include install tasks"
ansible.builtin.include_tasks: install.yml
when:
- tomcat.install_method is defined

- ansible.builtin.include_tasks: systemd/systemd.yml
- name: "Include systemd tasks"
ansible.builtin.include_tasks: systemd/systemd.yml
when:
- tomcat.install_method is defined
- tomcat.install_method != "rpm"
Expand Down Expand Up @@ -119,12 +122,14 @@
- "conf/tomcat-users.xml"
- "conf/jaspic-providers.xml"

- ansible.builtin.include_tasks: sanity_checks/ajp.yml
- name: "Include ajp sanity check tasks"
ansible.builtin.include_tasks: sanity_checks/ajp.yml
when:
- tomcat.listen.ajp.enabled is defined
- tomcat_listen_ajp_enabled

- ansible.builtin.include_tasks: sanity_checks/https.yml
- name: "Include https sanity check tasks"
ansible.builtin.include_tasks: sanity_checks/https.yml
when:
- tomcat_listen_https_enabled is defined
- tomcat_listen_https_enabled
Expand All @@ -144,7 +149,8 @@
notify:
- Restart Tomcat service

- ansible.builtin.include_tasks: systemd/selinux.yml
- name: "Include selinux configuration tasks"
ansible.builtin.include_tasks: systemd/selinux.yml
when:
- tomcat.install_method is defined
- tomcat.install_method != "rpm"
Expand Down