lib/vagrant-salt/provisioner.rb in vagrant-salt-0.1.1 vs lib/vagrant-salt/provisioner.rb in vagrant-salt-0.1.2

- old
+ new

@@ -66,19 +66,19 @@ env[:ui].info "Salt binaries not found." return false end def add_salt_repo - env[:ui].info "Adding Salt PPA." + env[:ui].info "Adding salt repository." env[:vm].channel.sudo("apt-get update") env[:vm].channel.sudo("apt-get -q -y install python-software-properties") env[:vm].channel.sudo("add-apt-repository -y ppa:saltstack/salt") env[:vm].channel.sudo("apt-get -q -y update") end def install_salt_minion - env[:ui].info "Installing salt minion." + env[:ui].info "Installing salt binaries." env[:vm].channel.sudo("apt-get -q -y install salt-minion") end def accept_minion_key env[:ui].info "Accepting minion key." @@ -111,10 +111,12 @@ env[:vm].channel.sudo("mv /tmp/minion.pub /etc/salt/pki/minion.pub") end def provision! - verify_shared_folders([config.salt_file_root_guest_path, config.salt_pillar_root_guest_path]) + if !config.master + verify_shared_folders([config.salt_file_root_guest_path, config.salt_pillar_root_guest_path]) + end if !salt_exists add_salt_repo install_salt_minion end \ No newline at end of file