lib/salted-rails/capistrano_helper.rb in salted-rails-0.0.7 vs lib/salted-rails/capistrano_helper.rb in salted-rails-0.0.8

- old
+ new

@@ -8,11 +8,11 @@ require 'salted-rails/helper_base' module SaltedRails class CapistranoHelper < HelperBase - def initialize(rails_root, logger = Log4r::Logger.new("salted_rails::capistrano_helper")) + def initialize(project_root, logger = Log4r::Logger.new("salted_rails::capistrano_helper")) super(rail_root, logger) end # def configure_vagrant(config) # config.vm.box = 'UbuntuCloud_12.04_32bit' @@ -53,11 +53,11 @@ # # Bootstrap salt # ## config.vm.provision :shell, :inline => 'salt-call --version || wget -O - http://bootstrap.saltstack.org | sudo sh' # # Provisioning #2: masterless highstate call # config.vm.provision :salt do |salt| # @logger.info 'Configuring salt provisioner' if @logger -# minion_file = @rails_root + 'config/salt/vagrant/minion' +# minion_file = @project_root + 'config/salt/vagrant/minion' # minion_file = @salt_root + 'salt/vagrant/minion' unless File.exists? minion_file # salt.minion_config = minion_file # salt.run_highstate = true # salt.verbose = !! @logger # end @@ -73,10 +73,10 @@ # def configure_gui(vm_config, memory = 1024) # @gui = true # configure_memory(memory) # vm_config.vm.boot_mode == :gui # vm_config.vm.provision :salt do |salt| -# minion_file = @rails_root + 'config/salt/vagrant/gui_minion' +# minion_file = @project_root + 'config/salt/vagrant/gui_minion' # minion_file = @salt_root + 'salt/vagrant/gui_minion' unless File.exists? minion_file # salt.minion_config = minion_file # end # end #