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.

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

Fix upstream issues #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix upstream issues #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1faf7b
Switch to ansible_host
gkranis Mar 28, 2023
d912836
Log output instead of sending to stdout directly
gkranis Apr 12, 2023
dab197e
Isolate ansible inventory per instance
gkranis Apr 12, 2023
1d608b4
Dont limit
gkranis Apr 7, 2023
e26e40c
Stream output
gkranis Apr 21, 2023
c971403
Prefix ansible logs with kitchen suite name
gkranis Apr 24, 2023
d5c3c4f
Fix tests
gkranis Jun 2, 2023
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
2 changes: 1 addition & 1 deletion lib/kitchen-ansible/util_inventory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def generate_instance_inventory(name, host, mygroup, instance_connection_option,
end

temp_hash = {}
temp_hash['ansible_host'] = host
temp_hash['ansible_ssh_host'] = host
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a quick check, this doesn't seem to be used any more.
If this is not used, can't we remove it? Or are you going the most conservative route just in case? 🤔

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BaCaRoZzo I seem to remember that I removed it and something broke so i left it as is, but im not 100% sure

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EIther that or I thought i might want to keep the plugin's compatibility with older ansible versions

temp_hash['ansible_ssh_port'] = port if port
temp_hash['ansible_ssh_private_key_file'] = keys[0] if keys
Expand All @@ -30,7 +31,6 @@ def generate_instance_inventory(name, host, mygroup, instance_connection_option,
temp_hash['ansible_winrm_server_cert_validation'] = 'ignore'
temp_hash['ansible_winrm_transport'] = 'ssl'
temp_hash['ansible_connection'] = 'winrm'
temp_hash['ansible_host'] = temp_hash['ansible_ssh_host']
temp_hash['ansible_user'] = temp_hash['ansible_ssh_user']
end
{ name => temp_hash }
Expand Down