Upgrade Ansible collection to the newest version

.gitignore

@@ -0,0 +1 @@
+dynatrace-oneagent-*

README.md

@@ -1,24 +1,31 @@
 # Dynatrace OneAgent collection
-
-In its current state, collection consist of a single role that deploys Dynatrace OneAgent on Linux and Windows operating systems using dedicated configuration and ensures the OneAgent service maintains a running state.
+In its current state, the collection consists of a single role that deploys Dynatrace OneAgent on Linux and Windows operating systems using dedicated configuration and ensures the OneAgent service maintains a running state.
 
 ## Requirements
+### General
+* Ansible >= 2.15.0
+### Windows
+* pywinrm >= 0.4.1
 
-Using this collection requires the following:
+## Setup
+`pip install -r requirements.txt`
 
-* Ansible >= 2.9.0
-* pywinrm >= 0.4.1
+## Build
+`ansible-galaxy collection build .`
 
 ## Installation
+To install the latest stable release of the collection on your system, call:
 
-Use `ansible-galaxy collection install dynatrace.oneagent` to install the latest stable release of the collection on your system.
+`ansible-galaxy collection install dynatrace.oneagent`
 
-## License
+To install the locally built collection on your system, call:
 
+`ansible-galaxy collection install dynatrace-oneagent-<version>.tar.gz`
+
+## License
 Licensed under the MIT License.
 
 ## Support
-
 In case of difficulties, contact our [SUPPORT].
 
 [SUPPORT]: https://www.dynatrace.com/support/contact-support/

meta/runtime.yml

@@ -1,3 +1,3 @@
 ---
 # Required version of ansible-core to use the collection
-requires_ansible: ">=2.14.0"
+requires_ansible: ">=2.15.0"

requirements.txt

@@ -0,0 +1,2 @@
+ansible >= 2.15.0
+pywinrm >= 0.4.1 ; sys_platform == 'win32'

roles/oneagent/README.md

@@ -41,7 +41,7 @@ The following variables are available in `defaults/main/` and can be overridden:
 
 | Name | Default | Description
 |-|-|-
-| `oneagent_environment_url` | `-` | The URL of the target Dynatrace environment (SaaS or Managed).
+| `oneagent_environment_url` | `-` | The URL of the target Dynatrace environment (see [Direct download from your environment](#direct-download-from-your-environment)).
 | `oneagent_paas_token` | `-` | The [PaaS Token] retrieved from the "Deploy Dynatrace" installer page.
 | `oneagent_local_installer` | `-` | The Path to OneAgent installer stored on the main node.
 | `oneagent_installer_arch` | `-` | Specifies the OneAgent installer architecture.

roles/oneagent/tasks/config/config.yml

@@ -1,7 +1,7 @@
 ---
 - name: Combine configuration parameters
   ansible.builtin.set_fact:
-    _oneagent_all_config_args: "{{ oneagent_passed_install_args | map('regex_search', '(--set-(.*))') | select('string') | list }} --restart-service"
+    _oneagent_all_config_args: "{{ oneagent_passed_install_args | map('regex_search', '(--set-(.*))') | select('string') | list + ['--restart-service'] }}"
   no_log: true
 
 - name: Apply OneAgent configuration

roles/oneagent/tasks/install/post-install-unix.yml

@@ -3,9 +3,9 @@
   ansible.builtin.reboot:
     reboot_timeout: oneagent_reboot_timeout
   register: _oneagent_reboot_status
-  when: oneagent_reboot_host
+  when: oneagent_reboot_host | bool
 
 - name: Check the host reboot status
   ansible.builtin.fail:
     msg: "{{ oneagent_reboot_failed }}"
-  when: oneagent_reboot_host and not _oneagent_reboot_status.rebooted|default(false)
+  when: oneagent_reboot_host | bool and not _oneagent_reboot_status.rebooted|default(false)

roles/oneagent/tasks/install/post-install-windows.yml

@@ -3,9 +3,9 @@
   win_reboot:
     reboot_timeout: oneagent_reboot_timeout
   register: _oneagent_reboot_status
-  when: oneagent_reboot_host
+  when: oneagent_reboot_host | bool
 
 - name: Check the host reboot status
   ansible.builtin.fail:
     msg: "{{ oneagent_reboot_failed }}"
-  when: oneagent_reboot_host and not _oneagent_reboot_status.rebooted|default(false)
+  when: oneagent_reboot_host | bool and not _oneagent_reboot_status.rebooted|default(false)

roles/oneagent/tasks/main.yml

@@ -25,7 +25,7 @@
   always:
     - name: Cleanup
       ansible.builtin.include_tasks: cleanup/cleanup.yml
-      when: oneagent_is_operation_installation and not oneagent_preserve_installer
+      when: oneagent_is_operation_installation and not (oneagent_preserve_installer | bool)
 
 - name: Uninstall OneAgent
   ansible.builtin.include_tasks: uninstall/uninstall.yml

roles/oneagent/tasks/params/params.yml

@@ -22,8 +22,9 @@
     msg: "{{ oneagent_unknown_arch | format(oneagent_download_arch, oneagent_available_arch) }}"
   when: oneagent_is_operation_installation and not oneagent_download_arch in oneagent_available_arch
 
+- ansible.builtin.include_tasks: tasks/params/params-{{ oneagent_system_family }}.yml
+
 - name: Validate OneAgent installer version parameter
-  ansible.builtin.include_tasks: tasks/params/params-{{ oneagent_system_family }}.yml
   ansible.builtin.fail:
     msg: "{{ oneagent_version_lower_than_minimal | format(oneagent_version, oneagent_minimal_install_version) }}"
   when: oneagent_is_operation_installation and oneagent_version != 'latest' and oneagent_version < oneagent_minimal_install_version

roles/oneagent/tasks/provide-installer/download.yml

@@ -9,8 +9,9 @@
     "#VER": "{{ (oneagent_version == 'latest') | ternary('', 'version/') + oneagent_version }}"
     "#ARCH": "{{ oneagent_download_arch }}"
 
+- ansible.builtin.include_tasks: provide-installer/download-{{ oneagent_system_family }}.yml
+
 - name: Verify download result
-  ansible.builtin.include_tasks: provide-installer/download-{{ oneagent_system_family }}.yml
   ansible.builtin.fail:
     msg: "{{ oneagent_failed_download | format(_oneagent_download_result.response | default(_oneagent_download_result.msg)) }}"
   when: _oneagent_download_result.failed|default(false)

roles/oneagent/vars/aix.yml

@@ -4,12 +4,10 @@ oneagent_default_install_dir: /opt/dynatrace/oneagent
 oneagent_default_download_dir: "{{ ansible_env['TEMP'] | default('/tmp') }}"
 
 oneagent_download_system: aix
-oneagent_available_arch: "{{ [ oneagent_default_arch ] }}"
+oneagent_available_arch: [ "{{ oneagent_default_arch }}" ]
 oneagent_download_arch: "{{ oneagent_installer_arch | default(oneagent_default_arch, true) }}"
 
-oneagent_install_path: >
-  "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first |
-  default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)', '\\1') }}"
+oneagent_install_path: "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first | default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)', '\\1') }}"
 oneagent_download_path: "{{ oneagent_download_dir | default(oneagent_default_download_dir, true) }}"
 oneagent_installer_path: "{{ oneagent_download_path }}/Dynatrace-OneAgent-AIX-{{ oneagent_version }}.sh"
 oneagent_ctl_bin_path: "{{ oneagent_install_path }}/agent/tools/oneagentctl"

roles/oneagent/vars/linux.yml

@@ -4,12 +4,10 @@ oneagent_default_install_dir: /opt/dynatrace/oneagent
 oneagent_default_download_dir: "{{ ansible_env['TEMP'] | default('/tmp') }}"
 
 oneagent_download_system: unix
-oneagent_available_arch: "{{ [ oneagent_default_arch, 'ppcle', 's390', 'arm' ] }}"
+oneagent_available_arch: [ "{{ oneagent_default_arch }}", "ppcle", "s390", "arm" ]
 oneagent_download_arch: "{{ oneagent_installer_arch | default(oneagent_default_arch, true) }}"
 
-oneagent_install_path: >
-  "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first | default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)',
-  '\\1') }}"
+oneagent_install_path: "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first | default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)','\\1') }}"
 oneagent_download_path: "{{ oneagent_download_dir | default(oneagent_default_download_dir, true) }}"
 oneagent_installer_arch_name: "{{ (oneagent_download_arch == oneagent_default_arch) | ternary('', oneagent_download_arch + '-') }}"
 oneagent_installer_path: "{{ oneagent_download_path }}/Dynatrace-OneAgent-Linux-{{ oneagent_installer_arch_name }}{{ oneagent_version }}.sh"

roles/oneagent/vars/main.yml

@@ -9,13 +9,12 @@ oneagent_system_is_windows: "{{ oneagent_system_name == 'win32nt' }}"
 oneagent_system_family: "{{ oneagent_system_is_windows | ternary('windows', 'unix') }}"
 
 oneagent_is_operation_uninstall: "{{ oneagent_package_state == 'absent' }}"
-oneagent_is_operation_configuration: >
-  "{{ not oneagent_is_operation_uninstall and oneagent_environment_url|length == 0 and oneagent_paas_token|length == 0 and oneagent_local_installer|
-  length == 0 }}"
-oneagent_is_operation_installation: "{{ not (oneagent_is_operation_uninstall or oneagent_is_operation_configuration) }}"
+oneagent_is_operation_configuration: "{{ not oneagent_is_operation_uninstall and oneagent_environment_url|length == 0 and oneagent_paas_token|length == 0 and oneagent_local_installer|length == 0 }}"
+oneagent_is_operation_installation: "{{ not (oneagent_is_operation_uninstall or oneagent_is_operation_configuration | bool) }}"
 
-oneagent_passed_install_args: "{{ (oneagent_install_args + oneagent_platform_install_args) | unique }}"
+oneagent_passed_install_args: "{{ (oneagent_install_args + oneagent_platform_install_args) | unique(case_sensitive=False) }}"
 oneagent_default_download_url: "#URL/api/v1/deployment/installer/agent/#SYS/default/#VER?arch=#ARCH"
-oneagent_additional_reporting_params: >
-  "{{ [ '--set-deployment-metadata=\"orchestration_tech=Ansible\"', '--set-deployment-metadata=\"tech_version=' + ansible_version.full
-  + '\"', '--set-deployment-metadata=\"script_version=' + oneagent_script_version + '\"' ] }}"
+oneagent_additional_reporting_params:
+  - "--set-deployment-metadata=\"orchestration_tech=Ansible\""
+  - "--set-deployment-metadata=\"tech_version='{{ ansible_version.full }}'\""
+  - "--set-deployment-metadata=\"script_version='{{ oneagent_script_version }}'\""

roles/oneagent/vars/win32nt.yml

@@ -4,12 +4,10 @@ oneagent_default_install_dir: "{{ ansible_env.SystemDrive }}\\Program Files\\dyn
 oneagent_default_download_dir: "{{ ansible_env['TEMP'] | default('C:\\Windows\\Temp') }}"
 
 oneagent_download_system: windows
-oneagent_available_arch: "{{ [ oneagent_default_arch ] }}"
+oneagent_available_arch: [ "{{ oneagent_default_arch }}" ]
 oneagent_download_arch: "{{ oneagent_installer_arch | default(oneagent_default_arch, true) }}"
 
-oneagent_install_path: >
-  "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first |
-  default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)', '\\1') }}"
+oneagent_install_path: "{{ oneagent_passed_install_args | select('regex', 'INSTALL_PATH') | first | default(oneagent_default_install_dir) | regex_replace('INSTALL_PATH=(.*)', '\\1') }}"
 oneagent_ctl_bin_path: "{{ oneagent_install_path }}\\agent\\tools\\oneagentctl.exe"
 oneagent_download_path: "{{ oneagent_download_dir | default(oneagent_default_download_dir, true) }}"
 oneagent_installer_path: "{{ oneagent_download_path }}\\Dynatrace-OneAgent-Windows-{{ oneagent_version }}.exe"