vagrant-salt 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -68,7 +68,7 @@ module VagrantSalt
68
68
  end
69
69
 
70
70
  def add_salt_repo
71
- env[:ui].info "Adding Salt PPA."
71
+ env[:ui].info "Adding salt repository."
72
72
  env[:vm].channel.sudo("apt-get update")
73
73
  env[:vm].channel.sudo("apt-get -q -y install python-software-properties")
74
74
  env[:vm].channel.sudo("add-apt-repository -y ppa:saltstack/salt")
@@ -76,7 +76,7 @@ module VagrantSalt
76
76
  end
77
77
 
78
78
  def install_salt_minion
79
- env[:ui].info "Installing salt minion."
79
+ env[:ui].info "Installing salt binaries."
80
80
  env[:vm].channel.sudo("apt-get -q -y install salt-minion")
81
81
  end
82
82
 
@@ -113,7 +113,9 @@ module VagrantSalt
113
113
 
114
114
  def provision!
115
115
 
116
- verify_shared_folders([config.salt_file_root_guest_path, config.salt_pillar_root_guest_path])
116
+ if !config.master
117
+ verify_shared_folders([config.salt_file_root_guest_path, config.salt_pillar_root_guest_path])
118
+ end
117
119
 
118
120
  if !salt_exists
119
121
  add_salt_repo
data/vagrant-salt.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "vagrant-salt"
6
- s.version = "0.1.1"
6
+ s.version = "0.1.2"
7
7
  s.authors = ["Alec Koumjian", "Kiall Mac Innes"]
8
8
  s.email = ["akoumjian@gmail.com", "kiall@managedit.ie"]
9
9
  s.homepage = "https://github.com/akoumjian/salty-vagrant"
@@ -16,4 +16,4 @@ Gem::Specification.new do |s|
16
16
  s.require_paths = ["lib"]
17
17
 
18
18
  s.add_runtime_dependency "vagrant"
19
- end
19
+ end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 1
8
- - 1
9
- version: 0.1.1
8
+ - 2
9
+ version: 0.1.2
10
10
  platform: ruby
11
11
  authors:
12
12
  - Alec Koumjian
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-07-31 00:00:00 -07:00
18
+ date: 2012-08-03 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency