diff --git a/app/views/unattended/provisioning_templates/snippet/ansible_tower_callback_service.erb b/app/views/unattended/provisioning_templates/snippet/ansible_tower_callback_service.erb index c5bedfd689..af726caa69 100644 --- a/app/views/unattended/provisioning_templates/snippet/ansible_tower_callback_service.erb +++ b/app/views/unattended/provisioning_templates/snippet/ansible_tower_callback_service.erb @@ -14,10 +14,11 @@ After=network-online.target [Service] Type=oneshot +TimeoutStartSec=300s <% if host_param('ansible_extra_vars') -%> -ExecStart=/usr/bin/curl -k -s -H 'Content-Type: application/json' --data '{"host_config_key":"<%= host_param('ansible_host_config_key') %>", "extra_vars": <%=host_param('ansible_extra_vars') %>}' <%= host_param('ansible_tower_api_url') %>/job_templates/<%= host_param('ansible_job_template_id') %>/callback/ +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors -H 'Content-Type: application/json' --data '{"host_config_key":"<%= host_param('ansible_host_config_key') %>", "extra_vars": <%= host_param('ansible_extra_vars') %>}' <%= host_param('ansible_tower_api_url') %>/job_templates/<%= host_param('ansible_job_template_id') %>/callback/ <% else -%> -ExecStart=/usr/bin/curl -k -s --data "host_config_key=<%= host_param('ansible_host_config_key') -%>" <%= host_param('ansible_tower_api_url') -%>/job_templates/<%= host_param('ansible_job_template_id') -%>/callback/ +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=<%= host_param('ansible_host_config_key') -%>" <%= host_param('ansible_tower_api_url') -%>/job_templates/<%= host_param('ansible_job_template_id') -%>/callback/ <% end -%> ExecStartPost=/usr/bin/systemctl disable ansible-callback diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.debian4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.debian4dhcp.snap.txt index 1ef97e80b8..cb7efcff92 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.debian4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.debian4dhcp.snap.txt @@ -112,7 +112,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.ubuntu4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.ubuntu4dhcp.snap.txt index 23993ad1f1..6f30169a2b 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.ubuntu4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.ubuntu4dhcp.snap.txt @@ -112,7 +112,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt index 95cfe075ae..c4f1156aa9 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt @@ -293,7 +293,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt index 8f8c1a13e8..d9c739e5aa 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt @@ -389,7 +389,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt index 1718b1dc88..e98c744b48 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt @@ -293,7 +293,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt index a48c0ccaa3..ec5e69c8a6 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt @@ -293,7 +293,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt index 5ffe1f2f2d..7cc880fbd1 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt @@ -293,7 +293,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel10_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel10_dhcp.snap.txt index 6296e1e4cd..afc9a39023 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel10_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel10_dhcp.snap.txt @@ -184,7 +184,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt index 9c1dd22baf..6eabb0d0e4 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rhel9_dhcp.snap.txt @@ -184,7 +184,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky10_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky10_dhcp.snap.txt index c3e054d273..ec69ad364d 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky10_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky10_dhcp.snap.txt @@ -292,7 +292,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt index 2d27dc0dd8..f998dd1e66 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt @@ -291,7 +291,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt index 556b6d860a..a90823fb8b 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt @@ -292,7 +292,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install] diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/snippet/ansible_tower_callback_service.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/snippet/ansible_tower_callback_service.host4dhcp.snap.txt index 96b67dd8d8..40a882ed02 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/snippet/ansible_tower_callback_service.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/snippet/ansible_tower_callback_service.host4dhcp.snap.txt @@ -5,7 +5,8 @@ After=network-online.target [Service] Type=oneshot -ExecStart=/usr/bin/curl -k -s --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ +TimeoutStartSec=300s +ExecStart=/usr/bin/curl -k -sS -f --connect-timeout 10 --retry 11 --retry-delay 5 --retry-all-errors --data "host_config_key=" https://host.example.com/api/controller/v2/job_templates/20/callback/ ExecStartPost=/usr/bin/systemctl disable ansible-callback [Install]