diff --git a/chef/cookbooks/provisioner/recipes/update_nodes.rb b/chef/cookbooks/provisioner/recipes/update_nodes.rb index 882510adea..5d64a20872 100644 --- a/chef/cookbooks/provisioner/recipes/update_nodes.rb +++ b/chef/cookbooks/provisioner/recipes/update_nodes.rb @@ -322,6 +322,9 @@ def find_node_boot_mac_addresses(node, admin_data_net) cloud_available = true if name.include? "Cloud" end + ntp_servers = search(:node, "roles:ntp-server") + ntp_servers_ips = ntp_servers.map { |n| Chef::Recipe::Barclamp::Inventory.get_network_by_type(n, "admin").address } + autoyast_template = mnode[:state] == "os-upgrading" ? "autoyast-upgrade" : "autoyast" template "#{node_cfg_dir}/autoyast.xml" do mode 0644 @@ -341,6 +344,7 @@ def find_node_boot_mac_addresses(node, admin_data_net) node_ip: mnode[:crowbar][:network][:admin][:address], node_fqdn: mnode[:fqdn], node_hostname: mnode[:hostname], + ntp_servers: ntp_servers_ips, platform: target_platform_distro, target_platform_version: target_platform_version, architecture: arch, diff --git a/chef/cookbooks/provisioner/templates/default/autoyast-upgrade.xml.erb b/chef/cookbooks/provisioner/templates/default/autoyast-upgrade.xml.erb index b5c1d2021b..3a83fa0c7b 100644 --- a/chef/cookbooks/provisioner/templates/default/autoyast-upgrade.xml.erb +++ b/chef/cookbooks/provisioner/templates/default/autoyast-upgrade.xml.erb @@ -12,6 +12,7 @@ false false true + <%= @ntp_servers.first %> none diff --git a/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb b/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb index 3d57491eab..a9dc47c7e7 100644 --- a/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb +++ b/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb @@ -12,6 +12,7 @@ false false true + <%= @ntp_servers.first %> none