vagrant-saltdeps 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGLOG.md +1 -1
- data/README.md +1 -1
- data/lib/vagrant-saltdeps/action.rb +2 -2
- data/lib/vagrant-saltdeps/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 22cb89abcb3064923a7aa8e823f67d1b3b2c7f5f
|
4
|
+
data.tar.gz: d0359388b03c827b41f8d5e7a6ebcf90449fa0f0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 292f91131d8429e6fd521321fbc54a2217680aedb9206c4f8e10f3152125a009e8e4ca758145a281011bdffd03ce42142ead78c1902612a21c231af4d6668a9a
|
7
|
+
data.tar.gz: a3f210ea1ff001a2c9ae20947fa5a23dcd36e77cb5d73657b05e9e6fa80c8896c6ecc5f2e7f4428a836724ee42229b1a78af312d4976b111e9cdb0fead159674
|
data/CHANGLOG.md
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
## 1.1.0 (2015-09-21)
|
2
2
|
|
3
3
|
Base Vagrantfile:
|
4
|
-
- you can now configure a `
|
4
|
+
- you can now configure a `base_vagrantfile` git repo that all of your saltdeps projects can inherit from. This allows you to share common configuration. See README for more details.
|
5
5
|
|
6
6
|
## 1.0.6 (2015-04-13)
|
7
7
|
|
data/README.md
CHANGED
@@ -101,7 +101,7 @@ This project exposes a few configuration options so you can decide the best way
|
|
101
101
|
* **merge_pillars** - Tells saltdeps if it should merge your dependent pillars into one file. Defaults to `true`.
|
102
102
|
* **merge_grains** - Tells saltdeps if it should merge your dependent grains into one file. Defaults to `true`.
|
103
103
|
* **merge_path** - Path where saltdeps should put the results of the merged pillars and grains files. Defaults to `.vagrant-salt/compiled_grains` and `.vagrant-salt/compiled_pillars`.
|
104
|
-
* **base_vagrantfile** - This defines a git repo that has a single `Vagrantfile` in the root of the repository. This Vagrantfile is loaded before the Vagrantfile in the root of the project. The intention here is to allow for common configuration to be shared between salt formula. Any settings in the base Vagrantfile can be overridden with the Vagrantfile in your salt formula repository. The goal is to reduce the number of edits you have to do across the
|
104
|
+
* **base_vagrantfile** - This defines a git repo that has a single `Vagrantfile` in the root of the repository. This Vagrantfile is loaded before the Vagrantfile in the root of the project. The intention here is to allow for common configuration to be shared between salt formula. Any settings in the base Vagrantfile can be overridden with the Vagrantfile in your salt formula repository. The goal is to reduce the number of edits you have to do across the Vagrantfiles in your different formulas.
|
105
105
|
|
106
106
|
|
107
107
|
## Development
|
@@ -7,8 +7,8 @@ module Vagrant
|
|
7
7
|
end
|
8
8
|
|
9
9
|
def call(env)
|
10
|
-
base_vagrantfile =
|
11
|
-
checkout_path =
|
10
|
+
base_vagrantfile = Vagrant::Plugin::V2::Config.const_get(:UNSET_VALUE)
|
11
|
+
checkout_path = Vagrant::Plugin::V2::Config.const_get(:UNSET_VALUE)
|
12
12
|
config_loader = env[:env].config_loader
|
13
13
|
|
14
14
|
v = Vagrantfile.new(config_loader, [:home,:root])
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-saltdeps
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Joseph Hughes
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-10-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: git
|