oscar 0.2.0alpha4 → 0.2.0alpha5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/oscar/environment.rb +0 -7
- data/lib/oscar/networking.rb +1 -1
- data/lib/oscar/schema.yaml +0 -12
- data/lib/oscar/version.rb +1 -1
- data/oscar.gemspec +1 -1
- metadata +4 -4
data/lib/oscar/environment.rb
CHANGED
|
@@ -21,14 +21,7 @@ class Oscar::Environment
|
|
|
21
21
|
@nodes << node
|
|
22
22
|
end
|
|
23
23
|
|
|
24
|
-
pe_build_options = @config.data["provisioners"].find do |hash|
|
|
25
|
-
hash["name"] == "pe_build"
|
|
26
|
-
end
|
|
27
|
-
|
|
28
24
|
Vagrant::Config.run do |config|
|
|
29
|
-
config.pe_build.download_root = pe_build_options["options"]["download_root"]
|
|
30
|
-
config.pe_build.version = pe_build_options["options"]["version"]
|
|
31
|
-
config.pe_build.filename = pe_build_options["options"]["filename"]
|
|
32
25
|
@nodes.each { |node| node.define(config) }
|
|
33
26
|
end
|
|
34
27
|
end
|
data/lib/oscar/networking.rb
CHANGED
|
@@ -30,7 +30,7 @@ class Oscar::Networking
|
|
|
30
30
|
arr = []
|
|
31
31
|
|
|
32
32
|
arr << ['127.0.0.1', ['localhost']]
|
|
33
|
-
arr << ['127.0.1.1', [node.name]]
|
|
33
|
+
arr << ['127.0.1.1', ["#{node.name}.#{@domainname}", node.name]]
|
|
34
34
|
|
|
35
35
|
@nodes.each_pair { |address, n| arr << [address, [n.name, "#{n.name}.#{@domainname}"]] }
|
|
36
36
|
|
data/lib/oscar/schema.yaml
CHANGED
|
@@ -62,18 +62,6 @@ mapping:
|
|
|
62
62
|
name: { required: true }
|
|
63
63
|
"forwards": *forwards
|
|
64
64
|
|
|
65
|
-
"provisioners":
|
|
66
|
-
desc: "bla bla bla"
|
|
67
|
-
type: seq
|
|
68
|
-
sequence:
|
|
69
|
-
-
|
|
70
|
-
type: map
|
|
71
|
-
mapping:
|
|
72
|
-
"name":
|
|
73
|
-
required: true
|
|
74
|
-
"options":
|
|
75
|
-
type: any
|
|
76
|
-
|
|
77
65
|
# Network configuration for oscar, not applicable to any node.
|
|
78
66
|
"networking":
|
|
79
67
|
type: map
|
data/lib/oscar/version.rb
CHANGED
data/oscar.gemspec
CHANGED
|
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
|
|
|
18
18
|
gem.homepage = 'https://github.com/adrienthebo/oscar'
|
|
19
19
|
|
|
20
20
|
gem.add_dependency 'vagrant', '~> 1.0.0'
|
|
21
|
-
gem.add_dependency 'vagrant-hosts', '
|
|
21
|
+
gem.add_dependency 'vagrant-hosts', '~> 0.0.1'
|
|
22
22
|
gem.add_dependency 'vagrant-pe_build', '>= 0.0.1'
|
|
23
23
|
gem.add_dependency 'kwalify', '~> 0.7.0'
|
|
24
24
|
gem.add_dependency 'ipaddress', '~> 0.8.0'
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: oscar
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.0alpha5
|
|
5
5
|
prerelease: 5
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-
|
|
12
|
+
date: 2013-04-18 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: vagrant
|
|
@@ -32,7 +32,7 @@ dependencies:
|
|
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
|
33
33
|
none: false
|
|
34
34
|
requirements:
|
|
35
|
-
- -
|
|
35
|
+
- - ~>
|
|
36
36
|
- !ruby/object:Gem::Version
|
|
37
37
|
version: 0.0.1
|
|
38
38
|
type: :runtime
|
|
@@ -40,7 +40,7 @@ dependencies:
|
|
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
|
41
41
|
none: false
|
|
42
42
|
requirements:
|
|
43
|
-
- -
|
|
43
|
+
- - ~>
|
|
44
44
|
- !ruby/object:Gem::Version
|
|
45
45
|
version: 0.0.1
|
|
46
46
|
- !ruby/object:Gem::Dependency
|