opskeleton 0.6.4 → 0.6.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f0ce97c953f80ab8ee81d8702974054793781cf6
4
- data.tar.gz: 7fde5abe563d7a19aa1fe909e43d44d3000b81c7
3
+ metadata.gz: e92301580b01d64a5808cde6aff9bed738e8636a
4
+ data.tar.gz: 13f78f354879a24e20afdcb1b83b57c3dc0e7a0f
5
5
  SHA512:
6
- metadata.gz: 55f8f738ce76f66d382aecc2ae553070a2305f5d9cd859f5a99ade740ba825431a75a8e8bfe0b53910bd9c2c4a812fe1395d762a357d7012375a305df480c2de
7
- data.tar.gz: 04327c6ca106b4c777bfaab9ae84d3b9c8ede2f16689a918e320d923f4d0094314caf882f4ecf69ba9296b7aa25f5195e7dc94391754205e1eb080557d5cd84c
6
+ metadata.gz: 18a912f6f0d0a3f2a0e879a9ffee8cdb7bb0969ed85bed0d21a8487e4ff1aacf324f81b6485dc7f4cc20130735b05254d815e5230c25cd00acf093abe3420c72
7
+ data.tar.gz: 782d5321bd5a211d63ddcf5f3fb23d4112160956837448c0bc4e3aaec69cf52f291d0bd2b81a51a9cb933fa33398a5ca6c736cedbe1c0ff8439a185ce681fb09
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- opskeleton (0.6.4)
4
+ opskeleton (0.6.5)
5
5
  bintray_deploy
6
6
  thor
7
7
 
@@ -17,9 +17,9 @@ module Opsk
17
17
  empty_directory(path)
18
18
  case options['os_type']
19
19
  when 'bsd'
20
- template('templates/vagrant_bsd.erb', "#{path}/Vagrantfile")
20
+ template('templates/puppet/vagrant_bsd.erb', "#{path}/Vagrantfile")
21
21
  else
22
- template('templates/vagrant.erb', "#{path}/Vagrantfile")
22
+ template('templates/puppet/vagrant.erb', "#{path}/Vagrantfile")
23
23
  end
24
24
  end
25
25
 
@@ -1,3 +1,3 @@
1
1
  module Opskeleton
2
- VERSION = '0.6.4'
2
+ VERSION = '0.6.5'
3
3
  end
@@ -23,7 +23,7 @@ end
23
23
 
24
24
  namespace :serverspec do
25
25
 
26
- %w(<%=@name=>).each do |profile|
26
+ %w(<%=@name%>).each do |profile|
27
27
  ServerspecTask.new(profile.to_sym) do |t|
28
28
  t.target = profile
29
29
  t.pattern = "spec/#{profile}/*_spec.rb"
@@ -1,27 +1,28 @@
1
1
  # -*- mode: ruby -*-
2
2
  # vi: set ft=ruby :
3
3
  Vagrant.configure("2") do |config|
4
+ config.vm.define :<%=name%> do |node|
5
+ bridge = ENV['VAGRANT_BRIDGE']
6
+ bridge ||= 'eth0'
7
+ env = ENV['PUPPET_ENV']
8
+ env ||= 'dev'
4
9
 
5
- bridge = ENV['VAGRANT_BRIDGE']
6
- bridge ||= 'eth0'
7
- env = ENV['PUPPET_ENV']
8
- env ||= 'dev'
10
+ node.vm.box = '<%=box%>' <%if(options['box_url']) %>
11
+ <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
12
+ node.vm.network :public_network, :bridge => bridge
13
+ node.vm.hostname = '<%=name%>.local'
9
14
 
10
- config.vm.box = '<%=box%>' <%if(options['box_url']) %>
11
- <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
12
- config.vm.network :public_network, :bridge => bridge
13
- config.vm.hostname = '<%=name%>.local'
15
+ node.vm.provider :virtualbox do |vb|
16
+ vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
17
+ end
14
18
 
15
- config.vm.provider :virtualbox do |vb|
16
- vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
17
- end
18
-
19
- config.vm.provision :chef_solo do |chef|
20
- chef.cookbooks_path = ['static-cookbooks', 'cookbooks']
21
- chef.roles_path = 'roles'
22
- chef.add_role('<%=name%>')
23
- chef.environment = env
24
- chef.environments_path = 'environments'
19
+ node.vm.provision :chef_solo do |chef|
20
+ chef.cookbooks_path = ['static-cookbooks', 'cookbooks']
21
+ chef.roles_path = 'roles'
22
+ chef.add_role('<%=name%>')
23
+ chef.environment = env
24
+ chef.environments_path = 'environments'
25
+ end
25
26
  end
26
27
 
27
28
  end
@@ -39,7 +39,7 @@ end
39
39
 
40
40
  namespace :serverspec do
41
41
 
42
- %w(<%=@name=>).each do |profile|
42
+ %w(<%=@name%>).each do |profile|
43
43
  ServerspecTask.new(profile.to_sym) do |t|
44
44
  t.target = profile
45
45
  t.pattern = "spec/#{profile}/*_spec.rb"
@@ -0,0 +1,28 @@
1
+ # -*- mode: ruby -*-
2
+ # vi: set ft=ruby :
3
+ Vagrant.configure("2") do |config|
4
+
5
+ config.vm.define :<%=name%> do |node|
6
+ bridge = ENV['VAGRANT_BRIDGE']
7
+ bridge ||= 'eth0'
8
+ env = ENV['PUPPET_ENV']
9
+ env ||= 'dev'
10
+
11
+ node.vm.box = '<%=box%>' <%if(options['box_url']) %>
12
+ <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
13
+ node.vm.network :public_network, :bridge => bridge
14
+ node.vm.hostname = '<%=name%>.local'
15
+
16
+ node.vm.provider :virtualbox do |vb|
17
+ vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
18
+ end
19
+
20
+ node.vm.provision :puppet do |puppet|
21
+ puppet.manifests_path = 'manifests'
22
+ puppet.manifest_file = 'default.pp'
23
+ puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
24
+
25
+ end
26
+ end
27
+
28
+ end
@@ -0,0 +1,25 @@
1
+ # -*- mode: ruby -*-
2
+ # vi: set ft=ruby :
3
+ Vagrant.configure("2") do |config|
4
+
5
+ config.vm.define :<%=name%> do |node|
6
+ bridge = ENV['VAGRANT_BRIDGE']
7
+ bridge ||= 'eth0'
8
+ env = ENV['PUPPET_ENV']
9
+ env ||= 'dev'
10
+
11
+ node.vm.box = '<%=box%>' <%if(options['box_url']) %>
12
+ <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
13
+ node.vm.guest = :freebsd
14
+ node.vm.network :public_network, :bridge => bridge
15
+ node.vm.network "private_network", ip: "10.0.1.10"
16
+ node.vm.hostname = '<%=name%>.local'
17
+
18
+ node.vm.provider :virtualbox do |vb|
19
+ vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
20
+ end
21
+
22
+ node.vm.synced_folder ".", "/vagrant", :nfs => true, id: "vagrant-root"
23
+ node.vm.provision "shell", inline: 'cd /vagrant && ./run.sh'
24
+ end
25
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opskeleton
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.4
4
+ version: 0.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - narkisr
@@ -175,12 +175,12 @@ files:
175
175
  - templates/puppet/scripts/lookup.rb
176
176
  - templates/puppet/scripts/run.sh
177
177
  - templates/puppet/site.erb
178
+ - templates/puppet/vagrant.erb
179
+ - templates/puppet/vagrant_bsd.erb
178
180
  - templates/puppetfile.erb
179
181
  - templates/ruby-gemset.erb
180
182
  - templates/ruby-version.erb
181
183
  - templates/spec.erb
182
- - templates/vagrant.erb
183
- - templates/vagrant_bsd.erb
184
184
  - test/chef_package_test.rb
185
185
  - test/puppet_package_test.rb
186
186
  - test/test_helper.rb
@@ -1,26 +0,0 @@
1
- # -*- mode: ruby -*-
2
- # vi: set ft=ruby :
3
- Vagrant.configure("2") do |config|
4
-
5
- bridge = ENV['VAGRANT_BRIDGE']
6
- bridge ||= 'eth0'
7
- env = ENV['PUPPET_ENV']
8
- env ||= 'dev'
9
-
10
- config.vm.box = '<%=box%>' <%if(options['box_url']) %>
11
- <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
12
- config.vm.network :public_network, :bridge => bridge
13
- config.vm.hostname = '<%=name%>.local'
14
-
15
- config.vm.provider :virtualbox do |vb|
16
- vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
17
- end
18
-
19
- config.vm.provision :puppet do |puppet|
20
- puppet.manifests_path = 'manifests'
21
- puppet.manifest_file = 'default.pp'
22
- puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
23
-
24
- end
25
-
26
- end
@@ -1,23 +0,0 @@
1
- # -*- mode: ruby -*-
2
- # vi: set ft=ruby :
3
- Vagrant.configure("2") do |config|
4
-
5
- bridge = ENV['VAGRANT_BRIDGE']
6
- bridge ||= 'eth0'
7
- env = ENV['PUPPET_ENV']
8
- env ||= 'dev'
9
-
10
- config.vm.box = '<%=box%>' <%if(options['box_url']) %>
11
- <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
12
- config.vm.guest = :freebsd
13
- config.vm.network :public_network, :bridge => bridge
14
- config.vm.network "private_network", ip: "10.0.1.10"
15
- config.vm.hostname = '<%=name%>.local'
16
-
17
- config.vm.provider :virtualbox do |vb|
18
- vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
19
- end
20
-
21
- config.vm.synced_folder ".", "/vagrant", :nfs => true, id: "vagrant-root"
22
- config.vm.provision "shell", inline: 'cd /vagrant && ./run.sh'
23
- end