vagrant-hiera 0.2.1 → 0.3.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.3@vagrant-hiera --create

data/Gemfile

@@ -1,4 +1,10 @@
 source 'https://rubygems.org'
 
+gem 'vagrant'
+gem 'hiera'
+gem 'hiera-puppet'
+
+gem 'vagrant-vbguest'
+
 # Specify your gem's dependencies in vagrant-hiera.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant::Hiera
 
-TODO: Configures puppet-heira on your vagrant box
+Configures puppet-heira on your vagrant box
 
 ## Installation
 
@@ -20,7 +20,7 @@ Or install it yourself as:
 
 Create a [hiera.yaml](https://github.com/puppetlabs/hiera-puppet#module-user) file on your host with the datadir pointing to `/tmp/vagrant-hiera/data`
 
-    :json:
+    :yaml:
       :datadir: /var/lib/hiera
 
 Add the following to your VagrantFile:
@@ -33,6 +33,10 @@ 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:
+- https://github.com/puppetlabs/hiera-puppet#installation
+- https://groups.google.com/d/msg/puppet-users/IlPq14Rsnm0/UhbbRUsqqLgJ
+
 ## Contributing
 
 1. Fork it

data/example/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'vagrant'
+gem 'hiera'
+gem 'hiera-puppet'
+
+gem 'vagrant-vbguest'
+gem 'vagrant-puppetconf'

data/example/Vagrantfile

@@ -0,0 +1,20 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  config.vm.box = "lucid32"
+  config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+
+  config.hiera.config_path = './configuration'
+  config.hiera.config_file = 'hiera.yaml'
+  config.hiera.data_path = './configuration'
+
+  config.puppetconf.updates = {'main/environment' => 'test'}
+
+  config.vm.provision :puppet do |puppet|
+    puppet.module_path = "./modules"
+    puppet.manifests_path = "./manifests"
+    puppet.manifest_file  = "base.pp"
+  end
+
+end

data/example/configuration/hiera.yaml

@@ -0,0 +1,5 @@
+---
+:backends: - yaml
+:hierarchy: - %{environment}
+:yaml:
+  :datadir: /tmp/vagrant-hiera/data

data/example/configuration/production.yaml

@@ -0,0 +1 @@
+motd: This is the production environment.

data/example/configuration/test.yaml

@@ -0,0 +1 @@
+motd: This is the test environment.

data/example/manifests/base.pp

@@ -0,0 +1,3 @@
+node default {
+  include motd
+}

data/example/modules/.svn/entries

@@ -0,0 +1,40 @@
+10
+
+dir
+1867
+svn+ssh://svn01.colo/provisioning/trunk/ubuntu/modules/puppetdashboard
+svn+ssh://svn01.colo/provisioning
+
+
+
+2012-06-22T19:48:52.032815Z
+1790
+nhall
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+56248164-2702-44e3-8289-0c7dae5ae4d4
+
+files
+dir
+
+tests
+dir
+
+manifests
+dir
+
+templates
+dir
+

data/example/modules/motd/manifests/init.pp

@@ -0,0 +1,6 @@
+class motd {
+  file { '/etc/motd':
+    #    content => function_hiera('motd')
+    content => hiera('motd')
+  }
+}

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

@@ -5,27 +5,69 @@ 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.1rc3puppetlabs1'
+        @hiera_puppet_version = '1.0.0-0.1rc1-1-g3e68ff0'
+        @hiera_version = '1.0.0-0.1rc3'
       end
 
       def call(env)
         @env = env
         if @env[:vm].config.hiera.set?
-          install_puppet_hiera unless puppet_hiera_installed?
+          add_apt_repo unless apt_repo_set?
+          install_puppet unless puppet_installed?
+          install_hiera unless hiera_installed?
+          install_puppet_hiera unless hiera_puppet_installed?
           create_shared_folders
           create_symlink_to_hiera_config
         end
         @app.call(env)
       end
 
-      def puppet_hiera_installed?
-        installed = ( @env[:vm].channel.execute("gem list | grep hiera-puppet", :error_check => false) == 0 )
+      def hiera_installed?
+        installed = ( @env[:vm].channel.execute("dpkg -l | grep puppet | grep #{@puppet_version}", :error_check => false) == 0 )
         @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.hiera_installed') if installed
         installed
       end
 
-      def install_puppet_hiera
-        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.installing_hiera')
-        @env[:vm].channel.sudo("gem install hiera-puppet")
+      def install_hiera
+        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera')
+        @env[:vm].channel.sudo("apt-get -y --force-yes install hiera=#{@hiera_version}")
+      end
+
+      def apt_repo_set?
+        setup = ( @env[:vm].channel.execute("grep '#{@puppet_repo}' /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("apt-get -y --force-yes update")
+      end
+
+      def puppet_installed?
+        installed = ( @env[:vm].channel.execute("dpkg -l | grep puppet | grep #{@puppet_version}", :error_check => false) == 0 )
+        @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.puppet_installed') if installed
+        installed
+      end
+
+      def install_puppet
+        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_puppet')
+        @env[:vm].channel.sudo("apt-get -y --force-yes install puppet-common=#{@puppet_version}")
+        @env[:vm].channel.sudo("apt-get -y --force-yes install puppet=#{@puppet_version}")
+      end
+
+      def hiera_puppet_installed?
+        installed = ( @env[:vm].channel.execute("dpkg -l | grep hiera-puppet | grep #{@hiera_puppet_version}", :error_check => false) == 0 )
+        @env[:ui].success I18n.t('vagrant.plugins.hiera.middleware.setup.hiera_puppet_installed') if installed
+        installed
+      end
+
+      def install_hiera_puppet
+        @env[:ui].warn I18n.t('vagrant.plugins.hiera.middleware.setup.install_hiera_puppet')
+        @env[:vm].channel.sudo("apt-get -y --force-yes install hiera-puppet=#{@hiera_puppet_version}")
       end
 
       def create_shared_folders
@@ -40,6 +82,9 @@ module VagrantHiera
       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")
+        # 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")
       end
     end

data/lib/vagrant-hiera/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hiera
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/locales/en.yml

@@ -6,7 +6,13 @@ en:
           prepare:
             shared_folders: "Creating hiera shared folders metadata..."
           setup:
-            hiera_installed: "puppet-hiera is installed"
-            installing_hiera: "Installing puppet-hiera"
+            hiera_installed: "hiera is installed"
+            install_hiera: "Installing hiera"
+            hiera_puppet_installed: "puppet-hiera is installed"
+            install_hiera_puppet: "Installing puppet-hiera"
+            apt_repo_set: "Puppet repo exists"
+            add_apt_repo: "Adding puppet repo"
+            puppet_installed: "puppet is installed"
+            install_puppet: "Installing puppet"
             installing_hiera_config: "Adding hiera config file"
             shared_folders: "Adding hiera data folder"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hiera
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -34,10 +34,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- example/Gemfile
+- example/Vagrantfile
+- example/configuration/hiera.yaml
+- example/configuration/production.yaml
+- example/configuration/test.yaml
+- example/manifests/base.pp
+- example/modules/.svn/entries
+- example/modules/motd/manifests/init.pp
 - lib/vagrant-hiera.rb
 - lib/vagrant-hiera/config.rb
 - lib/vagrant-hiera/middleware/prepare.rb