vagrant-hiera 0.3.4 → 0.3.5

data/.gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+pkg/
+*.swp

data/Gemfile

@@ -1,3 +1,6 @@
+#ruby=1.9.3
+#ruby-gemset=vagrant-hiera
+
 source 'https://rubygems.org'
 
 gem 'vagrant'

data/README.md

@@ -33,10 +33,19 @@ And then...
 
 `vagrant up`
 
-**Note**: You will need to add/checkout [hiera-puppet]("https://github.com/puppetlabs/hiera-puppet" "Hiera Puppet") to your module path.  See the following links for more information:
+**Notes**: 
+You will need to add/checkout [hiera-puppet]("https://github.com/puppetlabs/hiera-puppet" "Hiera Puppet") to your module path.  See the following links for more information:
 - https://github.com/puppetlabs/hiera-puppet#installation
 - https://groups.google.com/d/msg/puppet-users/IlPq14Rsnm0/UhbbRUsqqLgJ
 
+I've only tested this plugin on puppet 3.  Thus, it will download and install puppet v3 (which as of now is a pre-release version).  Although it is not tested, if you would like to configure the plugin to use a different version of puppet, hiera, etc., you can do so by adding the following config to your Vagrantfile.
+
+```
+config.hiera.(puppet_apt_source|puppet_version|hiera_puppet_version|hiera_version|apt_opts) = ' ... '
+```
+
+Thanks to [haf]('http://github.com/haf') for the contribution.
+
 ## Contributing
 
 1. Fork it
@@ -44,3 +53,5 @@ And then...
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+

data/lib/vagrant-hiera/config.rb

@@ -7,6 +7,12 @@ module VagrantHiera
     attr_accessor :data_path
     attr_accessor :guest_data_path
 
+    attr_accessor :puppet_apt_source
+    attr_accessor :puppet_version
+    attr_accessor :hiera_puppet_version
+    attr_accessor :hiera_version
+    attr_accessor :apt_opts
+
     def guest_config_path
       @guest_config_path.nil? ? (@guest_config_path = '/tmp/vagrant-hiera/config') : @guest_config_path
     end
@@ -15,6 +21,26 @@ module VagrantHiera
       @guest_data_path.nil? ? (@guest_data_path = '/tmp/vagrant-hiera/data') : @guest_data_path
     end
 
+    def puppet_apt_source
+      @puppet_apt_source.nil? ? (@puppet_apt_source = 'deb http://apt.puppetlabs.com/ lucid devel main') : @puppet_apt_source
+    end
+
+    def puppet_version
+      @puppet_version.nil? ? (@puppet_version = '3.0.0-0.1rc5puppetlabs1') : @puppet_version
+    end
+
+    def hiera_puppet_version
+      @hiera_puppet_version.nil? ? (@hiera_puppet_version = '1.0.0-0.1rc3') : @hiera_puppet_version
+    end
+
+    def hiera_version
+      @hiera_version.nil? ? (@hiera_version = '1.0.0-0.1rc4') : @hiera_version
+    end
+
+    def apt_opts
+      @apt_opts.nil? ? (@apt_opts = '-y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"') : @apt_opts
+    end
+
     def config_path
       File.expand_path(@config_path) rescue nil
     end
@@ -31,6 +57,11 @@ module VagrantHiera
       errors.add("Config path can not be empty.") if config_path.nil?
       errors.add("Config file can not be empty.") if config_file.nil?
       errors.add("Data path can not be empty.") if data_path.nil?
+      errors.add("Puppet apt source can not be empty.") if puppet_apt_source.nil?
+      errors.add("Puppet version path can not be empty.") if puppet_version.nil?
+      errors.add("Hiera puppet version path can not be empty.") if hiera_puppet_version.nil?
+      errors.add("Hiera version path can not be empty.") if hiera_version.nil?
+      errors.add("Apt opts path can not be empty.") if apt_opts.nil?
       config = File.join("#{config_path}", "#{config_file}")
       errors.add("Config file not found at '#{config}'.") unless File.exists?(config)
       errors.add("Data directory not found at '#{data_path}'.") unless File.exists?("#{data_path}")

data/lib/vagrant-hiera/middleware/setup.rb

@@ -5,11 +5,17 @@ module VagrantHiera
       def initialize(app, env)
         @app = app
         @env = env
-        @puppet_repo = 'deb http://apt.puppetlabs.com/ lucid devel main'
-        @puppet_version = '3.0.0-0.1rc4puppetlabs1'
-        @hiera_puppet_version = '1.0.0-0.1rc1-1-g3e68ff0'
-        @hiera_version = '1.0.0-0.1rc3'
-        @apt_opts = "-y --force-yes -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
+
+        @guest_config_path    = @env[:vm].config.hiera.guest_config_path
+        @guest_data_path      = @env[:vm].config.hiera.guest_data_path
+        @config_path          = @env[:vm].config.hiera.config_path
+        @data_path            = @env[:vm].config.hiera.data_path
+        @config_file          = @env[:vm].config.hiera.config_file
+        @puppet_apt_source    = @env[:vm].config.hiera.puppet_apt_source
+        @puppet_version       = @env[:vm].config.hiera.puppet_version
+        @hiera_puppet_version = @env[:vm].config.hiera.hiera_puppet_version
+        @hiera_version        = @env[:vm].config.hiera.hiera_version
+        @apt_opts             = @env[:vm].config.hiera.apt_opts
       end
 
       def call(env)
@@ -18,7 +24,7 @@ module VagrantHiera
           add_apt_repo unless apt_repo_set?
           install_puppet unless puppet_installed?
           install_hiera unless hiera_installed?
-          install_puppet_hiera unless hiera_puppet_installed?
+          install_hiera_puppet unless hiera_puppet_installed?
           create_shared_folders
           create_symlink_to_hiera_config
         end
@@ -37,14 +43,16 @@ module VagrantHiera
       end
 
       def apt_repo_set?
-        setup = ( @env[:vm].channel.execute("grep '#{@puppet_repo}' /etc/apt/sources.list", :error_check => false) == 0 )
+        setup = ( @env[:vm].channel.execute("grep '#{@puppet_apt_source}' /etc/apt/sources.list", :error_check => false) == 0 )
         @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.apt_repo_set') if setup
         setup
       end
 
       def add_apt_repo
         @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.add_apt_repo')
-        @env[:vm].channel.sudo("echo '#{@puppet_repo}' >> /etc/apt/sources.list")
+        @env[:vm].channel.sudo("wget http://apt.puppetlabs.com/puppetlabs-release-stable.deb")
+        @env[:vm].channel.sudo("dpkg -i puppetlabs-release-stable.deb")
+        @env[:vm].channel.sudo("echo '#{@puppet_apt_source}' >> /etc/apt/sources.list.d/puppet.list")
         @env[:vm].channel.sudo("apt-get update")
       end
 
@@ -76,17 +84,17 @@ module VagrantHiera
         data = {}
         data[:owner] ||= @env[:vm].config.ssh.username
         data[:group] ||= @env[:vm].config.ssh.username
-        @env[:vm].guest.mount_shared_folder('vagrant-hiera-config', @env[:vm].config.hiera.guest_config_path, data)
-        @env[:vm].guest.mount_shared_folder('vagrant-hiera-data', @env[:vm].config.hiera.guest_data_path, data)
+        @env[:vm].guest.mount_shared_folder('vagrant-hiera-config', @guest_config_path, data)
+        @env[:vm].guest.mount_shared_folder('vagrant-hiera-data', @guest_data_path, data)
       end
 
       def create_symlink_to_hiera_config
         @env[:ui].info I18n.t('vagrant.plugins.hiera.middleware.setup.installing_hiera_config')
         @env[:vm].channel.sudo("mkdir -p /etc/puppet")
         # This is where I think this file will end up once the official puppet v3 release is out
-        @env[:vm].channel.sudo("ln -fs #{@env[:vm].config.hiera.guest_config_path}/#{@env[:vm].config.hiera.config_file} /etc/hiera.yaml")
+        @env[:vm].channel.sudo("ln -fs #{@guest_config_path}/#{@config_file} /etc/hiera.yaml")
         # But this is where it looks for it now
-        @env[:vm].channel.sudo("ln -fs #{@env[:vm].config.hiera.guest_config_path}/#{@env[:vm].config.hiera.config_file} /etc/puppet/hiera.yaml")
+        @env[:vm].channel.sudo("ln -fs #{@guest_config_path}/#{@config_file} /etc/puppet/hiera.yaml")
       end
     end
   end

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hiera
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -34,6 +34,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rvmrc
 - Gemfile
 - LICENSE