Skip to content
Draft
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: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ workflows:
matrix:
parameters:
ansible_version: ["2_10", "3_4", "4_10"]
os: ["debian", "centos", "amazonlinux2"]
os: ["debian", "centos", "amazonlinux2", "suse"]
apm_enabled: ["host", ""]
remote_updates: ["true", "false"]

4 changes: 3 additions & 1 deletion tasks/apm-inject-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
- name: Fail if APM Host injection is not supported on this host
fail:
msg: APM Host Injection is not supported in this platform.
when: ansible_facts.os_family not in ["Debian", "RedHat", "Rocky", "AlmaLinux"]
when: >
ansible_facts.os_family not in ["Debian", "RedHat", "Rocky", "AlmaLinux"] and
(ansible_facts.os_family == "Suse" and not datadog_installer_enabled)

- name: Fail if APM Host injection type does not contain a supported value
fail:
Expand Down
6 changes: 5 additions & 1 deletion tasks/installer-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
include_tasks: pkg-redhat/install-installer-yum.yml
when: ansible_facts.os_family in ["RedHat", "Rocky", "AlmaLinux"] and not ansible_check_mode and ansible_pkg_mgr == "yum"

- name: Include installer YUM install task
- name: Include installer DEB install task
include_tasks: pkg-debian/install-installer.yml
when: ansible_facts.os_family == "Debian" and not ansible_check_mode

- name: Include installer Zypper install task
include_tasks: pkg-suse/install-installer-zypper.yml
when: ansible_facts.os_family == "Suse" and not ansible_check_mode

- name: Bootstrap the installer
command: /usr/bin/datadog-bootstrap bootstrap
register: datadog_installer_bootstrap_result
Expand Down
4 changes: 4 additions & 0 deletions tasks/pkg-suse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@
register: agent_datadog_zypper_repo_template
when: datadog_manage_zypper_repofile

- name: Include installer setup
include_tasks: installer-setup.yml
when: datadog_installer_enabled

# refresh zypper repos only if the template changed
- name: Refresh Datadog zypper_repos # noqa: command-instead-of-module
command: zypper refresh datadog
Expand Down
7 changes: 7 additions & 0 deletions tasks/pkg-suse/install-installer-zypper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
- name: Install latest datadog-installer package (zypper)
zypper:
name: "{{ datadog_installer_flavor }}"
state: latest # noqa package-latest
register: datadog_installer_install_result
ignore_errors: true