falkorlib 0.7.13 → 0.7.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/falkorlib/bootstrap/vagrant.rb +6 -5
- data/lib/falkorlib/version.rb +1 -1
- data/templates/vagrant/Vagrantfile.erb +6 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5f96b7e36009e31c6d9eed26df3617c53101bdcf
|
|
4
|
+
data.tar.gz: 3d8dc321a00e3592917e33650345c3aadab3fa6f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0203e66c8c90616d7e253f38f7e56e9f1c46638afdfb4f4224a5eb9e96d09024bdbbe42defbe13d00d276b7ec1079529d70bf7ebd34c5003d8ceffafee036459
|
|
7
|
+
data.tar.gz: 114dcd3403f15da7b3fc37c63e4597bc254c21e5a8d66fffffafc3028f33be80f3f54a09c70b8470c3d910c70b784b1c52749e884dbf8be0cbb5e1ef80cca9de
|
data/Gemfile.lock
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
|
2
2
|
################################################################################
|
|
3
|
-
# Time-stamp: <Fri 2018-04-27
|
|
3
|
+
# Time-stamp: <Fri 2018-04-27 16:34 svarrette>
|
|
4
4
|
################################################################################
|
|
5
5
|
# Interface for Bootstrapping MkDocs
|
|
6
6
|
#
|
|
@@ -47,12 +47,13 @@ module FalkorLib
|
|
|
47
47
|
init_from_template(templatedir, rootdir, config,
|
|
48
48
|
:no_interaction => true,
|
|
49
49
|
:no_commit => true)
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
Dir.chdir( rootdir ) do
|
|
51
|
+
run %(git ignore '.vagrant/' )
|
|
52
|
+
# run %(ln -s README.md index.md )
|
|
52
53
|
# run %(ln -s README.md contributing/index.md )
|
|
53
54
|
# run %(ln -s README.md setup/index.md )
|
|
54
|
-
|
|
55
|
-
|
|
55
|
+
end
|
|
56
|
+
exit_status.to_i
|
|
56
57
|
end # vagrant
|
|
57
58
|
|
|
58
59
|
end # module Bootstrap
|
data/lib/falkorlib/version.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# -*- mode: ruby -*-
|
|
2
2
|
# vi: set ft=ruby :
|
|
3
|
-
# Time-stamp: <Fri 2018-04-27
|
|
3
|
+
# Time-stamp: <Fri 2018-04-27 16:31 svarrette>
|
|
4
4
|
###########################################################################################
|
|
5
5
|
# __ __ _ __ _ _
|
|
6
6
|
# \ \ / /_ _ __ _ _ __ __ _ _ __ | |_ / _(_) | ___
|
|
@@ -144,13 +144,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|
|
144
144
|
|
|
145
145
|
#__________________________________
|
|
146
146
|
settings[:vms].each do |name, node|
|
|
147
|
-
hostname = name
|
|
147
|
+
hostname = node[:hostname] ? node[:hostname] : name
|
|
148
148
|
domain = network[:domain]
|
|
149
149
|
fqdn = "#{hostname}.#{domain}"
|
|
150
|
-
os = defaults[:os].to_sym
|
|
151
|
-
ram = defaults[:ram]
|
|
152
|
-
vcpus = defaults[:vcpus]
|
|
153
|
-
desc = 'n/a'
|
|
150
|
+
os = node[:os] ? node[:os].to_sym : defaults[:os].to_sym
|
|
151
|
+
ram = node[:ram] ? node[:ram] : defaults[:ram]
|
|
152
|
+
vcpus = node[:vcpus] ? node[:vcpus] : defaults[:vcpus]
|
|
153
|
+
desc = node[:desc] ? node[:desc] : 'n/a'
|
|
154
154
|
|
|
155
155
|
abort "Non-existing box OS '#{os}' for the VM '#{name}'" if settings[:boxes][os.to_sym].nil?
|
|
156
156
|
abort "Empty IP address range" if ip_range.empty?
|