opskeleton 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1eee67ae87cd2cb4c1c0f7cee0c78fb62a89de
-  data.tar.gz: 5a01ca76ebd36a04f962ab72f07cd281a1a62240
+  metadata.gz: 67a2e7fa7fe5d23f114954650a13424ee72c6b21
+  data.tar.gz: f7ab522ae8a128a50ab48a422c370b8aa7192cba
 SHA512:
-  metadata.gz: bff1fb18e8e28eb8e47fb117de5226a665d8de7a298e5a685e1901db7fdfffd22328c3249f29fdd4c93c9ed32483a30b5c135b9294eaa6d7522d94fa1dfc0c0e
-  data.tar.gz: ddd589e8df1c1dccbf233eb3edbf2029c18e3fbcc4ddfa4ecc9f055d37d228441a952fa01f5d64def5a5eb06a45b66bb7734841acfa222a3a1a427a01f0e0508
+  metadata.gz: ea6eb2d818fdc6f5a7b11ade5a4c128ebe3866cfda8374fa1e09da3766fd41f1b67bb250a82fe9f0ef11059656ee1b62a3006fbc41f040563aa526c7fd99f374
+  data.tar.gz: d36231bf00e280cca10312f8ce4d6b865d28fd88868cae6d161f4915ec3127e70f7253b5cd4371bc87b317e226e3c519a69f7f81f1bbcf3afbaa17d3b11d55e7

data/CHANGES.md

@@ -1,3 +1,8 @@
+# Changes to opskeleton in version 0.8.1
+ 
+ * supporting rbenv conventions
+ * using bundle exec in boot
+ 
 # Changes to opskeleton in version 0.8.0
 
 * Adding plot/benchmark support.

data/Gemfile.lock

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

data/lib/opskeleton/generate_puppet.rb

@@ -6,6 +6,7 @@ module Opsk
     argument :box, :type => :string, :desc => 'Vagrant box type'
     class_option :box_url, :type=> :string, :desc => 'vagrant box url'
     class_option :os_type, :type=> :string, :desc => 'Operating system type (bsd/linux)'
+    class_option :provider, :type=> :string, :desc => 'Vagrant provider be it virtualbox, openstack etc..', :default => 'virtualbox'
     class_option :bench_enable, :type=> :boolean, :desc => 'Control if to enable benchmarking support'
 
     desc 'Generate a Vagrant, Puppet librarian and fpm project'

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.0'
+  VERSION = '0.8.2'
 end

data/puppet.md

@@ -38,7 +38,7 @@ Creating new (static) modules is easy as:
 $ opsk module foo
 ```
 
-Each generated module will contain puppet-rspec with matching Rakefile (see [testing](https://github.com/opskeleton/opskeleton#testing)).
+Each generated module will contain puppet-rspec with matching Rakefile. 
 
 ## Testing
 

data/templates/parent/spec/spec_helper.erb

@@ -70,6 +70,6 @@ RSpec.configure do |c|
 	f.write("#{json}\n") 
     }
     <% end %>
-    run("vagrant destroy #{c.host} -f")
+    run("vagrant destroy #{c.host} -f") unless ENV['SKIP_DESTROY']
   end
 end

data/templates/puppet/boot.sh

@@ -1,4 +1,4 @@
 gem install bundle
 bundle install
-librarian-puppet install
+bundle exec librarian-puppet install
 vagrant up

data/templates/puppet/vagrant.erb

@@ -1,5 +1,11 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+<%if(options['provider'].eql?('openstack')) -%>
+require 'vagrant-openstack-provider'
+require 'yaml'
+AUTH = YAML.load_file("#{ENV['HOME']}/.opsk.yaml")
+<%end -%>
+
 Vagrant.configure("2") do |config|
 
   config.vm.define :<%=name%> do |node|
@@ -8,15 +14,32 @@ Vagrant.configure("2") do |config|
     env  = ENV['PUPPET_ENV']
     env ||= 'dev'
 
-    node.vm.box = '<%=box%>' <%if(options['box_url']) %>
-    <%="node.vm.box_url = '#{options['box_url']}'"%> <%end%>
+    node.vm.box = '<%=box%>' 
+<%if(options['box_url']) -%>
+    <%="node.vm.box_url = '#{options['box_url']}'" -%> 
+<%end -%>
+<%if(options['provider'].eql?('virtualbox')) -%>
     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
-  
+<%elsif(options['provider'].eql?('openstack')) -%>
+    node.vm.box       = 'openstack'
+    node.ssh.username = 'ubuntu'
+
+    node.vm.provider :openstack do |os|
+      os.openstack_auth_url = 'http://hostname/tokens'
+      os.username           = AUTH['user']
+      os.password           = AUTH['pass']
+      os.tenant_name        = ''
+      os.flavor             = 'm1.small'
+      os.image              = ''
+      os.floating_ip_pool   = ''
+    end
+<%end -%>
+ 
     node.vm.provision :puppet do |puppet|
       puppet.manifests_path = 'manifests'
       puppet.manifest_file  = 'default.pp'

data/templates/ruby-version.erb

@@ -1 +1 @@
-ruby-1.9.3
+1.9.3-p551

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor