opskeleton 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ce97c953f80ab8ee81d8702974054793781cf6
-  data.tar.gz: 7fde5abe563d7a19aa1fe909e43d44d3000b81c7
+  metadata.gz: e92301580b01d64a5808cde6aff9bed738e8636a
+  data.tar.gz: 13f78f354879a24e20afdcb1b83b57c3dc0e7a0f
 SHA512:
-  metadata.gz: 55f8f738ce76f66d382aecc2ae553070a2305f5d9cd859f5a99ade740ba825431a75a8e8bfe0b53910bd9c2c4a812fe1395d762a357d7012375a305df480c2de
-  data.tar.gz: 04327c6ca106b4c777bfaab9ae84d3b9c8ede2f16689a918e320d923f4d0094314caf882f4ecf69ba9296b7aa25f5195e7dc94391754205e1eb080557d5cd84c
+  metadata.gz: 18a912f6f0d0a3f2a0e879a9ffee8cdb7bb0969ed85bed0d21a8487e4ff1aacf324f81b6485dc7f4cc20130735b05254d815e5230c25cd00acf093abe3420c72
+  data.tar.gz: 782d5321bd5a211d63ddcf5f3fb23d4112160956837448c0bc4e3aaec69cf52f291d0bd2b81a51a9cb933fa33398a5ca6c736cedbe1c0ff8439a185ce681fb09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.6.4)
+    opskeleton (0.6.5)
       bintray_deploy
       thor
 

data/lib/opskeleton/generate_puppet.rb

@@ -17,9 +17,9 @@ module Opsk
 	empty_directory(path)
 	case options['os_type'] 
 	when 'bsd'
-	  template('templates/vagrant_bsd.erb', "#{path}/Vagrantfile")
+	  template('templates/puppet/vagrant_bsd.erb', "#{path}/Vagrantfile")
 	else
-	  template('templates/vagrant.erb', "#{path}/Vagrantfile")
+	  template('templates/puppet/vagrant.erb', "#{path}/Vagrantfile")
 	end
     end
 

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/templates/chef/Rakefile

@@ -23,7 +23,7 @@ end
 
 namespace :serverspec do
 
-  %w(<%=@name=>).each do |profile|
+  %w(<%=@name%>).each do |profile|
     ServerspecTask.new(profile.to_sym) do |t|
 	t.target = profile
 	t.pattern = "spec/#{profile}/*_spec.rb"

data/templates/chef/vagrant.erb

@@ -1,27 +1,28 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Vagrant.configure("2") do |config|
+  config.vm.define :<%=name%> do |node|
+    bridge = ENV['VAGRANT_BRIDGE']
+    bridge ||= 'eth0'
+    env  = ENV['PUPPET_ENV']
+    env ||= 'dev'
 
-  bridge = ENV['VAGRANT_BRIDGE']
-  bridge ||= 'eth0'
-  env  = ENV['PUPPET_ENV']
-  env ||= 'dev'
+    node.vm.box = '<%=box%>' <%if(options['box_url']) %>
+    <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
+    node.vm.network :public_network, :bridge => bridge
+    node.vm.hostname = '<%=name%>.local'
 
-  config.vm.box = '<%=box%>' <%if(options['box_url']) %>
-  <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
-  config.vm.network :public_network, :bridge => bridge
-  config.vm.hostname = '<%=name%>.local'
+    node.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
+    end
 
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
-  end
-
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = ['static-cookbooks', 'cookbooks']
-    chef.roles_path = 'roles'
-    chef.add_role('<%=name%>')
-    chef.environment = env
-    chef.environments_path = 'environments'
+    node.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = ['static-cookbooks', 'cookbooks']
+      chef.roles_path = 'roles'
+      chef.add_role('<%=name%>')
+      chef.environment = env
+      chef.environments_path = 'environments'
+    end
   end
 
 end

data/templates/puppet/Rakefile

@@ -39,7 +39,7 @@ end
 
 namespace :serverspec do
 
-  %w(<%=@name=>).each do |profile|
+  %w(<%=@name%>).each do |profile|
     ServerspecTask.new(profile.to_sym) do |t|
       t.target = profile
       t.pattern = "spec/#{profile}/*_spec.rb"

data/templates/puppet/vagrant.erb

@@ -0,0 +1,28 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+Vagrant.configure("2") do |config|
+
+  config.vm.define :<%=name%> do |node|
+    bridge = ENV['VAGRANT_BRIDGE']
+    bridge ||= 'eth0'
+    env  = ENV['PUPPET_ENV']
+    env ||= 'dev'
+
+    node.vm.box = '<%=box%>' <%if(options['box_url']) %>
+    <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
+    node.vm.network :public_network, :bridge => bridge
+    node.vm.hostname = '<%=name%>.local'
+  
+    node.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
+    end
+  
+    node.vm.provision :puppet do |puppet|
+      puppet.manifests_path = 'manifests'
+      puppet.manifest_file  = 'default.pp'
+      puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
+  
+    end
+  end
+
+end

data/templates/puppet/vagrant_bsd.erb

@@ -0,0 +1,25 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+Vagrant.configure("2") do |config|
+  
+  config.vm.define :<%=name%> do |node|
+    bridge = ENV['VAGRANT_BRIDGE']
+    bridge ||= 'eth0'
+    env  = ENV['PUPPET_ENV']
+    env ||= 'dev'
+  
+    node.vm.box = '<%=box%>' <%if(options['box_url']) %>
+    <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
+    node.vm.guest = :freebsd
+    node.vm.network :public_network, :bridge => bridge
+    node.vm.network "private_network", ip: "10.0.1.10"
+    node.vm.hostname = '<%=name%>.local'
+  
+    node.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
+    end
+
+    node.vm.synced_folder ".", "/vagrant", :nfs => true, id: "vagrant-root"
+    node.vm.provision "shell", inline: 'cd /vagrant && ./run.sh'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - narkisr
@@ -175,12 +175,12 @@ files:
 - templates/puppet/scripts/lookup.rb
 - templates/puppet/scripts/run.sh
 - templates/puppet/site.erb
+- templates/puppet/vagrant.erb
+- templates/puppet/vagrant_bsd.erb
 - templates/puppetfile.erb
 - templates/ruby-gemset.erb
 - templates/ruby-version.erb
 - templates/spec.erb
-- templates/vagrant.erb
-- templates/vagrant_bsd.erb
 - test/chef_package_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb

data/templates/vagrant.erb

@@ -1,26 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.configure("2") do |config|
-
-  bridge = ENV['VAGRANT_BRIDGE']
-  bridge ||= 'eth0'
-  env  = ENV['PUPPET_ENV']
-  env ||= 'dev'
-
-  config.vm.box = '<%=box%>' <%if(options['box_url']) %>
-  <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
-  config.vm.network :public_network, :bridge => bridge
-  config.vm.hostname = '<%=name%>.local'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
-  end
-
-  config.vm.provision :puppet do |puppet|
-    puppet.manifests_path = 'manifests'
-    puppet.manifest_file  = 'default.pp'
-    puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
-
-  end
-
-end

data/templates/vagrant_bsd.erb

@@ -1,23 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.configure("2") do |config|
-
-  bridge = ENV['VAGRANT_BRIDGE']
-  bridge ||= 'eth0'
-  env  = ENV['PUPPET_ENV']
-  env ||= 'dev'
-
-  config.vm.box = '<%=box%>' <%if(options['box_url']) %>
-  <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
-  config.vm.guest = :freebsd
-  config.vm.network :public_network, :bridge => bridge
-  config.vm.network "private_network", ip: "10.0.1.10"
-  config.vm.hostname = '<%=name%>.local'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
-  end
-
-  config.vm.synced_folder ".", "/vagrant", :nfs => true, id: "vagrant-root"
-  config.vm.provision "shell", inline: 'cd /vagrant && ./run.sh'
-end