opskeleton 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c2e570a9a06828f6c0f8eb9a94addc4ba0f46b
-  data.tar.gz: 6b84d057ac2661d98756f7da999046138c1b525e
+  metadata.gz: 8f96d2a14553950d75977160174ecf2b915f7bf0
+  data.tar.gz: 6d7ee645e808222647d4da637ad06aa1cdee2283
 SHA512:
-  metadata.gz: 193f9cc34d66c018e8a87c61fadc0c48202647575980b3270adf3e1df983107af2b2f24a0bc2de8b40a2be1c857001c462ef236f4fa7ad4769207148d40f3d53
-  data.tar.gz: bf57906145847a13d6d6171599fb6a75129651cb815c8c89dab00e4fb362de8d65f38f5eed0fa04236b339f48bca309af41a75a189a8b293de8ebc33260a587c
+  metadata.gz: 1e10d4db5386945ccc1d1f6a50654a2fb65edbdfcc095353b022955b89745d329d1288a0091caede43e7bd2bb636ea8734f7a28f7f473dd8c79cf16571c98e7e
+  data.tar.gz: eb5ae8303fca728ff55ba4d10f218a3409f1d2366aa386fe70c6fb9751fe10fc48d5a5944cd43706f59b8ad4400b88fbb77330b31a55ce1f937ae34a8b5cea4d

data/CHANGES.md

@@ -1,3 +1,9 @@
+# Changes to opskeleton in version 0.8.5
+
+ * Misc templates cleanup
+ * Asserting path in which opsk tasks are being run
+ * Vagrant configuration plugin usage
+
 # Changes to opskeleton in version 0.8.3
 
  * openstack support 

data/Gemfile.lock

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

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/templates/puppet/default.erb

@@ -1,5 +1,3 @@
-group{ 'puppet': ensure  => present }
-
 node '<%=name%>.local' {
 
 }

data/templates/puppet/vagrant.erb

@@ -2,8 +2,6 @@
 # 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|
@@ -33,21 +31,20 @@ Vagrant.configure("2") do |config|
     node.ssh.username = 'ubuntu'
 
     node.vm.provider :openstack do |os|
-	os.openstack_auth_url = 'http://hostname/tokens'
-	os.username           = config.configuration.os_username
-	os.password           = config.configuration.os_password
-	os.tenant_name        = ''
-	os.flavor             = 'm1.small'
-	os.image              = ''
-	os.floating_ip_pool   = ''
+      os.openstack_auth_url = 'http://hostname/tokens'
+      os.username           = config.configuration.os_username
+      os.password           = config.configuration.os_password
+      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'
-	puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
-
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor