Skip to content

Make windows package download behavior consistent with linux #359

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.

Sign up for GitHub

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

Merged
bkabrda merged 3 commits into from
May 20, 2021
Merged

Make windows package download behavior consistent with linux #359

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8732481
Make windows package download behavior consistent with linux
camjay May 17, 2021
2167134
not attempt to delete msi in check mode
camjay May 18, 2021
a38b951
Update tasks/pkg-windows.yml
camjay May 19, 2021
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
6 changes: 3 additions & 3 deletions tasks/pkg-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
msg: "The Datadog ansible role does not currently support Agent 5"
when: datadog_agent_major_version|int == 5

# This is a best-effort solution to avoid redownloading the msi when
# This is a best-effort solution to avoid redownloading the msi when
# It won't work with rc / beta builds, and won't work if the version to install
# is not pinned (as we don't know what version latest will be before downloading
# the package).
Expand Down Expand Up @@ -72,7 +72,7 @@
url: "{{ dd_download_url }}"
dest: '%TEMP%\ddagent.msi'
register: download_msi_result
when: not datadog_skip_windows_install
when: (not datadog_skip_windows_install) and (not ansible_check_mode)

- name: Create Binary directory root (if not default)
win_file:
Expand Down Expand Up @@ -106,4 +106,4 @@
win_file:
path: "{{ download_msi_result.dest }}"
state: absent
when: (not datadog_skip_windows_install) and (download_msi_result.status_code == 200)
when: (not datadog_skip_windows_install) and (not ansible_check_mode) and (download_msi_result.status_code == 200)