Commit 95295057 authored by Pierre Neyron's avatar Pierre Neyron 🚴🏼

Homogeneize the VERBOSE param/env var bw commands.

parent 5d812f7c
Pipeline #74942 passed with stages
in 2 minutes and 17 seconds
...@@ -154,11 +154,7 @@ namespace :gen do ...@@ -154,11 +154,7 @@ namespace :gen do
exit(1) exit(1)
end end
if ENV['VERBOSE'] options[:verbose] = ENV['VERBOSE'].to_i if ENV['VERBOSE']
options[:verbose] = ENV['VERBOSE'].to_i
else
options[:verbose] = 0
end
ret = generate_oar_properties(options) ret = generate_oar_properties(options)
exit(ret) exit(ret)
...@@ -175,7 +171,7 @@ namespace :gen do ...@@ -175,7 +171,7 @@ namespace :gen do
options = {} options = {}
options[:sites] = ( ENV['SITE'] ? ENV['SITE'].split(',') : G5K_SITES ) options[:sites] = ( ENV['SITE'] ? ENV['SITE'].split(',') : G5K_SITES )
options[:output_dir] = ENV['OUTPUTDIR'] || PUPPET_ODIR options[:output_dir] = ENV['OUTPUTDIR'] || PUPPET_ODIR
options[:verbose] = (ENV['VERBOSE'] != nil) options[:verbose] = true if ENV['VERBOSE']
options[:conf_dir] = ENV['CONFDIR'] if ENV['CONFDIR'] options[:conf_dir] = ENV['CONFDIR'] if ENV['CONFDIR']
send("generate_puppet_#{t}", options) send("generate_puppet_#{t}", options)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment