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

tlspsk_auto with windows agent #450

Merged
merged 2 commits into from
Sep 10, 2021
Merged

tlspsk_auto with windows agent #450

merged 2 commits into from
Sep 10, 2021

Conversation

chicha75
Copy link
Contributor

@chicha75 chicha75 commented Sep 6, 2021

SUMMARY

Fixed some tiny things with agent deployment on windows

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

tls_autopsk-_agent2) tasks in the zabbix_agent role

ADDITIONAL INFORMATION

@chicha75 chicha75 marked this pull request as draft September 6, 2021 16:39
@chicha75 chicha75 changed the title Zabbixagentwindows tlspsk_auto with windows agent Sep 7, 2021
@chicha75 chicha75 marked this pull request as ready for review September 7, 2021 12:45
@chicha75 chicha75 mentioned this pull request Sep 7, 2021
@dj-wasabi
Copy link

Hi @chicha75

I merged a PR somewhere today and it seems you have changed a file as well, resulting in a merge conflict. Are you able to fix it? Once it is fixed and CI tests succeeds, I will be able to merge it. Thanks! 👍

@chicha75
Copy link
Contributor Author

chicha75 commented Sep 9, 2021

Hello @dj-wasabi,
I've removed the commit on Windows.yml as the last PR merge implements the same thing as I did about the windows firewall.
So there is only 1 commit to merge now and it concerns only the tlsauto_psk feature.

@dj-wasabi
Copy link

Hi @chicha75

The CI tests fails on the following:

ERROR: roles/zabbix_agent/tasks/tlspsk_auto_linux.yml:18:1: empty-lines: too many blank lines (1 > 0)
ERROR: roles/zabbix_agent/tasks/tlspsk_auto_windows.yml:18:1: empty-lines: too many blank lines (1 > 0)

Can you take a look?

@chicha75
Copy link
Contributor Author

Hey @dj-wasabi ,
I've removed the blank lines.

@dj-wasabi dj-wasabi merged commit 065fc43 into ansible-collections:main Sep 10, 2021
@dj-wasabi
Copy link

Thanks! 👍

@chicha75
Copy link
Contributor Author

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants