puppet_plugin 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb214b0edd03b30daf46c9215265cd042459ff2
-  data.tar.gz: 9cab620a6c59dd71a0c721a1723e48dea9c46a03
+  metadata.gz: 422e1a9c58d3f5ff39eb8162daddb150e796fbe7
+  data.tar.gz: d8e0b0a7ecc8f0f227cdd9bb6280663fbd350603
 SHA512:
-  metadata.gz: b3fb270940ab0cc7b0b719c8851f469548cef0fc5b453aa9e6852a63b7b7723b61d01e27e9ffa5307c64403132f6f3efc83ff60b25ff86641f139103d75024b0
-  data.tar.gz: af5292caf3853da582508ca248d09f5814ed2e2a77a203535a344db6671e2439fa7cf3d62ab14d6413b587f4da84ff7435dfc4ccefe10e68df3d91cd32637178
+  metadata.gz: 085acf996668eb47a80608a56bc82bbc5ad4a2b36efbf1b4b54063325d48ce7cbafcc3fdcfd017e33b82f11b86fc2c4771fbf613503ef0d1f631512185fd3bcb
+  data.tar.gz: cfa78054f89d7e973278c80a534b4ee3aa51006b333e7020311e0e46f2319b47330cc1c193ba719a76d47232cd3f2729f241e9598c91b51ff872dd264beb469d

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.vagrant/
+/puppet

data/Vagrantfile

@@ -14,16 +14,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", "3048"]
-    vb.customize ["modifyvm", :id, "--name", "db"]
+    # vb.customize ["modifyvm", :id, "--name", "db"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
     vb.customize ["modifyvm", :id, "--ioapic", "on"]
   end
 
-  config.vm.provision :puppet do |puppet|
+  config.vm.provision :shell, :inline => '', :id => 1
+
+  config.vm.provision :puppet, :id => 2 do |puppet|
     puppet.module_path       = "puppet/modules"
     puppet.manifests_path    = "puppet/manifests"
     puppet.manifest_file     = "site.pp"
-    # puppet.options           = "--verbose  --parser future"
+    puppet.options           = "--parser future"
     puppet.facter = {
       'environment' => 'obeheer1',
       'vm_type'     => 'vagrant'

data/lib/puppet_plugin.rb

@@ -6,6 +6,6 @@ end
 require 'byebug'
 require 'pry'
 require 'puppet_plugin/version'
-require 'puppet_plugin/identify/plugin'
+require 'puppet_plugin/puppet/plugin'
 
 I18n.load_path << File.expand_path('../templates/locales/en.yml', File.dirname(__FILE__))

data/lib/puppet_plugin/puppet/command.rb

@@ -0,0 +1,129 @@
+module Puppet
+  module CommandPuppet
+    class Command < Vagrant.plugin("2", "command")
+      def execute
+        @options = {}
+        @options[:verbose]     = false
+        @options[:debug]       = false
+        @options[:trace]       = false
+        @options[:provider]    = :virtualbox
+        @options[:environment] = 'obeheer1'
+        @options[:transport]   = 'vagrant'
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant puppet fqdn ipaddress [options]"
+          o.separator ""
+          o.separator "Options:"
+          o.separator ""
+
+          o.on("--[no-]puppet-debug",
+               "Run puppet with --debug (default to false)") do |debug|
+            @options[:debug] = debug
+          end
+
+          o.on("--[no-]verbose",
+               "Run puppet with --verbose (default to true)") do |verbose|
+            @options[:verbose] = verbose
+          end
+
+          o.on("--[no-]trace",
+               "Run puppet with --trace (default to true)") do |trace|
+            @options[:trace] = trace
+          end
+
+          o.on("--environment ENV", String,
+               "Specify the environment. Default is: obeheer1") do |environment|
+            @options[:environment] = environment
+          end
+
+
+          o.on("--transport TRANSPORT", String,
+               "Specify the transport. Default is: vagrant") do |transport|
+            @options[:transport] = transport
+          end
+
+
+          o.on("--provider PROVIDER", String,
+               "Back the machine with a specific provider") do |provider|
+            @options[:provider] = provider
+          end
+
+        end
+        # Parse the options
+        argv = parse_options(opts)
+        if argv && argv.size == 2
+          @fqdn       = argv[0]
+          @ipaddress  = argv[1]
+          @hostname   = @fqdn.split('.').first
+        else
+          @env.ui.error(I18n.t("vagrant.puppet_plugin.commands.identify.need_ip_and_name"))
+          return 1
+        end
+
+        @env.ui.info(I18n.t(
+          "vagrant.puppet_plugin.commands.identify.starting",
+          hostname: @fqdn,
+          ipaddress: @ipaddress))
+        #
+        # Get default machine from Vagrantfile
+        #
+        machine = @env.machine(:default, @options[:provider])
+        #
+        # Set name and ipadress based on parameters
+        #
+        set_machine_name(machine)
+        set_name_and_ip(machine)
+        set_shell_command(machine)
+        set_puppet_options(machine)
+        #
+        # Check what state we are in and act accordingly
+        #
+        if machine.state.id == :running
+          machine.action(:provision, @options)
+        else
+          machine.action(:up, @options)
+        end
+      end
+
+private
+      def set_machine_name(machine)
+        #
+        # This is a hack to set the machine name
+        #
+        new_name = @hostname.to_sym
+        machine.instance_variable_set(:@name, new_name)
+        machine.instance_variable_set(:@id, new_name)
+        ui = Vagrant::UI::Prefixed.new(@env.ui, new_name)
+        machine.instance_variable_set(:@ui, ui)
+        machine.provider_config.name = @hostname
+      end
+
+      def set_name_and_ip(machine)
+        machine.config.vm.hostname = @fqdn
+        machine.config.vm.network(:private_network, :ip => @ipaddress)
+      end
+
+      def set_puppet_options(machine)
+        provider = provider_with_id(2, machine)
+        provider.options  << ' --verbose ' if @options[:verbose]
+        provider.options  << ' --debug ' if @options[:debug]
+        provider.facter.merge!('environment' => @options[:environment])
+        provider.facter.merge!('transport' => @options[:transport])
+      end
+
+      def set_shell_command(machine)
+        provider = provider_with_id(1, machine)
+        command = "puppet apply -e \"host {'#{@fqdn}': ip => '#{@ipaddress}', host_aliases => ['#{@hostname}']} host {'localhost': ip=>  '127.0.0.1', host_aliases => 'localhost.localdomain,localhost4,localhost4.localdomain4' }\""
+        provider.inline = command # Add a shell provider
+        shell = machine.config.vm.provisioners.last.config
+        shell.finalize!
+      end
+
+      def provider_with_id(id, machine)
+        id = id.to_s
+        machine.config.vm.provisioners.select {|p| p.id == id}.first.config
+      end
+
+    end
+  end
+end

data/lib/puppet_plugin/{identify → puppet}/plugin.rb

@@ -1,12 +1,12 @@
 module Puppet
-  module CommandIdentify
+  module CommandPuppet
     class Plugin < Vagrant.plugin("2")
-      name "Identify as a known puppet node"
+      name "Load a known puppet node and apply the it"
       description <<-DESC
-      Boot as the specified node.
+      Boot as the specified node and run puppet on it.
       DESC
 
-      command("identify") do
+      command("puppet") do
         require_relative "command"
         Command
       end

data/lib/puppet_plugin/version.rb

@@ -1,3 +1,3 @@
 module PuppetPlugin
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Bert Hajee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,8 +52,8 @@ files:
 - Rakefile
 - Vagrantfile
 - lib/puppet_plugin.rb
-- lib/puppet_plugin/identify/command.rb
-- lib/puppet_plugin/identify/plugin.rb
+- lib/puppet_plugin/puppet/command.rb
+- lib/puppet_plugin/puppet/plugin.rb
 - lib/puppet_plugin/version.rb
 - puppet_plugin.gemspec
 - templates/locales/en.yml

data/lib/puppet_plugin/identify/command.rb

@@ -1,101 +0,0 @@
-module Puppet
-  module CommandIdentify
-    class Command < Vagrant.plugin("2", "command")
-      def execute
-        @options = {}
-        @options[:verbose]     = false
-        @options[:debug]       = false
-        @options[:trace]       = false
-        @options[:provider]    = 'virtualbox'
-        @options[:environment] = 'obeheer1'
-        @options[:transport]   = 'vagrant'
-
-        opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant identify [options] [name]"
-          o.separator ""
-          o.separator "Options:"
-          o.separator ""
-
-          o.on("--[no-]debug",
-               "Run puppet with --debug (default to false)") do |debug|
-            @options[:debug] = debug
-          end
-
-          o.on("--[no-]verbose",
-               "Run puppet with --verbose (default to true)") do |verbose|
-            @options[:verbose] = verbose
-          end
-
-
-          o.on("--[no-]trace",
-               "Run puppet with --trace (default to true)") do |trace|
-            @options[:trace] = trace
-          end
-
-          o.on("--environment ENV", String,
-               "Specify the environment. Default is: obeheer1") do |environment|
-            @options[:environment] = environment
-          end
-
-
-          o.on("--transport TRANSPORT", String,
-               "Specify the transport. Default is: vagrant") do |transport|
-            @options[:transport] = transport
-          end
-
-
-          o.on("--provider PROVIDER", String,
-               "Back the machine with a specific provider") do |provider|
-            @options[:provider] = provider
-          end
-
-        end
-        # Parse the options
-        argv = parse_options(opts)
-        if argv.size < 2
-          @env.ui.info(I18n.t("vagrant.puppet_plugin.commands.identify.need_ip_and_name"))
-          return 1
-        end
-
-        @hostname  = argv[0]
-        @ipaddress = argv[1]
- 
-        @env.ui.info(I18n.t(
-          "vagrant.puppet_plugin.commands.identify.starting",
-          hostname: @hostname,
-          ipaddress: @ipaddress))
-
-        with_target_vms('default', provider: @options[:provider]) do |machine|
-          set_name_and_ip(machine)
-          set_puppet_options(machine)
-          set_shell_command(machine)
-          machine.action(:up, @options)
-        end
-      end
-
-private
-      def set_name_and_ip(machine)
-        machine.config.vm.hostname = @hostname
-        machine.config.vm.network(:private_network, :ip => @ipaddress)
-      end
-
-      def set_puppet_options(machine)
-        puppet = machine.config.vm.provisioners.last.config
-        puppet.options  << '--verbose' if @options[:verbose]
-        puppet.options  << '--debug' if @options[:debug]
-        puppet.facter.merge!('environment' => @options[:environment])
-        puppet.facter.merge!('transport' => @options[:transport])
-      end
-
-      def set_shell_command(machine)
-        host_alias = @hostname.split('.').first
-        machine.config.vm.provision(:shell) # Add a shell provider
-        shell = machine.config.vm.provisioners.last.config
-        shell.inline = "puppet apply -e \"host {'#{@hostname}': ip => #{@ipaddress}, host_aliases => ['${host_alias}']} host {'localhost': ip=>  '127.0.0.1', host_aliases => 'localhost.localdomain,localhost4,localhost4.localdomain4' }\""
-        shell.path = nil
-        shell.args = nil
-      end
-
-    end
-  end
-end