Attachment 1626665 Details for Bug 1709752 – The patch has been created from the upstream patch and has been successfully tested on Satellite 6.5.2

[patch] The patch has been created from the upstream patch and has been successfully tested on Satellite 6.5.2

inventory_creator.patch (text/plain), 1.33 KB, created by S.Schwiedel on 2019-10-17 05:42:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: S.Schwiedel

Created: 2019-10-17 05:42:39 UTC

Size: 1.33 KB

patch

obsolete

>--- inventory_creator.rb	2019-10-16 09:26:34.154429724 +0200
>+++ inventory_creator.rb	2019-10-16 09:25:31.981711786 +0200
>@@ -19,10 +19,7 @@
>     # more advanced cases). Therefore we have only the 'all' group
>     # with all hosts.
>     def to_hash
>-      hosts = @hosts.map do |h|
>-        RemoteExecutionProvider.find_ip_or_hostname(h)
>-      end
>-
>+      hosts = @hosts.map(&:name)
>       { 'all' => { 'hosts' => hosts,
>                    'vars'  => template_inputs(@template_invocation) },
>         '_meta' => { 'hostvars' => hosts_vars } }
>@@ -31,7 +28,7 @@
>     def hosts_vars
>       hosts.reduce({}) do |hash, host|
>         hash.update(
>-          RemoteExecutionProvider.find_ip_or_hostname(host) => host_vars(host)
>+          host.name => host_vars(host)
>         )
>       end
>     end
>@@ -96,7 +93,8 @@
>         'ansible_ssh_pass' => rex_ssh_password(host),
>         'ansible_sudo_pass' => rex_sudo_password(host),
>         'ansible_ssh_private_key_file' => ansible_or_rex_ssh_private_key(host),
>-        'ansible_port' => host_setting(host, 'remote_execution_ssh_port')
>+        'ansible_port' => host_setting(host, 'remote_execution_ssh_port'),
>+        'ansible_host' => AnsibleProvider.find_ip_or_hostname(host)
>       }
>       params['ansible_become'] = true if params['ansible_become_user'].present?
>       # Backward compatibility for Ansible 1.x

Actions: View | Diff

Attachments on bug 1709752: 1626665 | 1629317