Merge branch '#840' into features

This commit is contained in:
Anton Martynov 2015-11-26 16:51:07 +03:00
commit 8fbb8ff317

View File

@ -228,6 +228,7 @@ module Devops
bootstrap_options.push "-N #{@server.chef_node_name}" if @server.chef_node_name
bootstrap_options.push "--sudo" unless @server.remote_user == "root"
bootstrap_options.push "-t #{options[:bootstrap_template]}" if options[:bootstrap_template]
bootstrap_options.push "-E #{options[:chef_environment]}" if options[:chef_environment]
rl = options[:run_list]
bootstrap_options.push "-r #{rl.join(",")}" unless rl.nil? or rl.empty?
bootstrap_options.push "-c #{options[:config]}" if options[:config]