Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 29bedcdd authored by DELABROYE Dimitri's avatar DELABROYE Dimitri
Browse files

[lib/refrepo/gen/puppet/kadeploy] make kadeploy use data instead if input

parent c240961c
No related branches found
No related tags found
1 merge request!11Bug 9861 changement des donnees d'entrees des generateurs
...@@ -26,16 +26,14 @@ end ...@@ -26,16 +26,14 @@ end
# Extract the node ip from the node hash # Extract the node ip from the node hash
def get_ip(node) def get_ip(node)
node['network_adapters'].each { |device, network_adapter| return node['network_adapters'].select { |n|
if network_adapter['mounted'] && /^eth[0-9]$/.match(device) n['mounted'] && n['device'] =~ /eth/
return network_adapter['ip'] }[0]['ip']
end
}
end end
def generate_puppet_kadeployg5k(options) def generate_puppet_kadeployg5k(options)
global_hash = load_yaml_file_hierarchy global_hash = load_data_hierarchy
if not options[:conf_dir] if not options[:conf_dir]
options[:conf_dir] = "#{options[:output_dir]}/platforms/production/generators/kadeploy" options[:conf_dir] = "#{options[:output_dir]}/platforms/production/generators/kadeploy"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment