vagrant-registration 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fa20b1599696327a619635fe9b1b9a512a2d1f
-  data.tar.gz: 46bfe62a920cff799b56e4fcd9584d17d5fc3454
+  metadata.gz: 6673cf990018e4be8aed666a506fa295fb63a221
+  data.tar.gz: 80a90d9201751177b443eca21bf20e6bfdcf7e3e
 SHA512:
-  metadata.gz: 4bb56047885aae33c1036337689583b4c845980bcc458f843d76a0a1d8025766ac81861aa4db0f8004249acaba882275066faf7d054138738f2bff320b38a216
-  data.tar.gz: b77a8c2831a1e9598d7d2af170f6020394d06c195546a30da2d0ededa3c78cb3d55ba4f4c4c14f4d579d33edd65b6b3e696d729788af4e3623222b95f501b3de
+  metadata.gz: f2b228f77a49268c994f244dc19d52143a69eeea2f628d54b5fb6034744c53b73e70f3388615fe3c1a7cb3c39b12e26e738bbd60ddad7c4f576cf62ab8013d9c
+  data.tar.gz: 04a31284b9b4369eb32d895ce35030ef34a1d93d3773e4172e2575564fbea74b3f3cb865779cdbc5fe4b23ffabcf3051d3381432554b07f3c938c2788ce42bca

data/.gitignore

@@ -8,7 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
-
+.idea/
 ## Specific to RubyMotion:
 .dat*
 .repl_history

data/README.md

@@ -28,5 +28,15 @@ If you prefer not to store your username/password on your filesystem, you can op
     config.registration.subscriber_username = ENV['SUB_USERNAME']
     config.registration.subscriber_password = ENV['SUB_PASSWORD']
 
+Finally, if you do not provide credentials, you will be prompted for them in the "up process." However, this is a tentative feature because if you are launching more than one VM from one Vagrantfile, the feature acts unexepectedly (appearing to hang because the prompt for creds gets lost in the scrollback). 
+
+You can also skip registration altogether if you would prefer but don't want to remove the plugin. If you want this function, please use
+
+    config.registration.skip = true
+
+RHEL Subscription Manager will fail if you attempt to register a registered machine (see the man page for why). In order to not slow boot time, we now, by default, pass the "--force" flag when we try to subscribe. If you want to disable this feature:
+
+    config.registration.force = false 
+
 ## Support
 Currently, "capabilities" are only provided for Red Hat's Subscription Manager. To add others, one just needs to add a new guest plugin, then a cap directory with register.rb and unregister.rb. See the redhat guest for an example. 

data/ides.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+yum update -y
+

data/lib/vagrant-registration.rb

@@ -15,6 +15,8 @@ module VagrantPlugins
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end
 
+    # Temporally load the extra capability files for Fedora
+    load(File.join(self.source_root, 'plugins/guests/fedora/plugin.rb'))
     # Temporally load the extra capability files for Red Hat
     load(File.join(self.source_root, 'plugins/guests/redhat/plugin.rb'))
   end

data/lib/vagrant-registration/action/register.rb

@@ -17,7 +17,13 @@ module VagrantPlugins
           guest = env[:machine].guest
           @logger.info("Testing for registration_register capability on ")
 
-          if guest.capability?(:register)
+          if guest.capability?(:register) && guest.capability?(:subscription_manager)
+
+            unless guest.capability(:subscription_manager)
+              config.skip=true
+              @logger.info("subscription-manager not found on guest")
+            end
+
             unless config.skip
               env[:ui].info("Registering box with vagrant-registration...")
 
@@ -35,7 +41,7 @@ module VagrantPlugins
                   config.subscriber_username, config.subscriber_password = register_on_screen(env[:ui])
                 end
               end
-
+              @logger.info("Registration is forced") if config.force
               result = guest.capability(:register) unless config.skip
             else
               @logger.debug("registration skipped due to configuration")

data/lib/vagrant-registration/action/unregister.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
         def call(env)
           guest = env[:machine].guest
 
-          if guest.capability?(:unregister)
+          if guest.capability?(:unregister) && guest.capability?(:subscription_manager)
             if !env[:machine].config.registration.skip
               env[:ui].info("Unregistering box with vagrant-registration...")
               @logger.info("registration_unregister capability exists on ")

data/lib/vagrant-registration/config.rb

@@ -18,16 +18,23 @@ module VagrantPlugins
       # @return [Bool]
       attr_accessor :skip
 
+      # Force the registration (skip if true)
+      #
+      # @return [Bool]
+      attr_accessor :force
+
       def initialize(region_specific=false)
         @subscriber_username = UNSET_VALUE
         @subscriber_password = UNSET_VALUE
         @skip = UNSET_VALUE
+        @force = true
       end
 
       def finalize!
         @subscriber_username = nil if @subscriber_username == UNSET_VALUE
         @subscriber_password = nil if @subscriber_password == UNSET_VALUE
         @skip = false if @skip == UNSET_VALUE
+        @force = true if @force == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-registration/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Registration
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/plugins/guests/fedora/cap/change_host_name.rb

@@ -0,0 +1,75 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          new(machine, name).change!
+        end
+
+        attr_reader :machine, :new_hostname
+
+        def initialize(machine, new_hostname)
+          @machine = machine
+          @new_hostname = new_hostname
+        end
+
+        def change!
+          return unless should_change?
+
+          update_etc_hostname
+          update_etc_hosts
+          refresh_hostname_service
+        end
+
+        def should_change?
+          new_hostname != current_hostname
+        end
+
+        def current_hostname
+          @current_hostname ||= get_current_hostname
+        end
+
+        def get_current_hostname
+          hostname = ""
+          sudo "hostname -f" do |type, data|
+            hostname = data.chomp if type == :stdout && hostname.empty?
+          end
+
+          hostname
+        end
+
+        def update_etc_hostname
+          sudo("echo '#{short_hostname}' > /etc/hostname")
+        end
+
+        # /etc/hosts should resemble:
+        # 127.0.0.1   localhost
+        # 127.0.1.1   host.fqdn.com host.fqdn host
+        def update_etc_hosts
+          ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
+          search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
+          replace    = "\\1 #{fqdn} #{short_hostname}"
+          expression = ['s', search, replace, 'g'].join('@')
+
+          sudo("sed -ri '#{expression}' /etc/hosts")
+        end
+
+        def refresh_hostname_service
+          sudo("hostname -F /etc/hostname")
+        end
+
+        def fqdn
+          new_hostname
+        end
+
+        def short_hostname
+          new_hostname.split('.').first
+        end
+
+        def sudo(cmd, &block)
+          machine.communicate.sudo(cmd, &block)
+        end
+      end
+    end
+  end
+end

data/plugins/guests/fedora/cap/configure_networks.rb

@@ -0,0 +1,98 @@
+require "set"
+require "tempfile"
+
+require "vagrant/util/retryable"
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class ConfigureNetworks
+        extend Vagrant::Util::Retryable
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          network_scripts_dir = machine.guest.capability("network_scripts_dir")
+
+          virtual = false
+          interface_names = Array.new
+          machine.communicate.sudo("/usr/sbin/biosdevname; echo $?") do |_, result|
+            virtual = true if result.chomp == '4'
+          end
+
+          if virtual
+            machine.communicate.sudo("ls /sys/class/net | grep -v lo") do |_, result|
+              interface_names = result.split("\n")
+            end
+
+            interface_names = networks.map do |network|
+               "#{interface_names[network[:interface]]}"
+            end
+          else
+            machine.communicate.sudo("/usr/sbin/biosdevname -d | grep Kernel | cut -f2 -d: | sed -e 's/ //;'") do |_, result|
+              interface_names = result.split("\n")
+            end
+
+            interface_name_pairs = Array.new
+            interface_names.each do |interface_name|
+              machine.communicate.sudo("/usr/sbin/biosdevname --policy=all_ethN -i #{interface_name}") do |_, result|
+                interface_name_pairs.push([interface_name, result.gsub("\n", "")])
+              end
+            end
+
+            setting_interface_names = networks.map do |network|
+               "eth#{network[:interface]}"
+            end
+
+            interface_name_pairs.each do |interface_name, previous_interface_name|
+              if setting_interface_names.index(previous_interface_name) == nil
+                interface_names.delete(interface_name)
+              end
+            end
+          end
+
+          # Accumulate the configurations to add to the interfaces file as well
+          # as what interfaces we're actually configuring since we use that later.
+          interfaces = Set.new
+          networks.each do |network|
+            interface = interface_names[network[:interface]-1]
+            interfaces.add(interface)
+            network[:device] = interface
+
+            # Remove any previous vagrant configuration in this network
+            # interface's configuration files.
+            machine.communicate.sudo("touch #{network_scripts_dir}/ifcfg-#{interface}")
+            machine.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-#{interface} > /tmp/vagrant-ifcfg-#{interface}")
+            machine.communicate.sudo("cat /tmp/vagrant-ifcfg-#{interface} > #{network_scripts_dir}/ifcfg-#{interface}")
+            machine.communicate.sudo("rm -f /tmp/vagrant-ifcfg-#{interface}")
+
+            # Render and upload the network entry file to a deterministic
+            # temporary location.
+            entry = TemplateRenderer.render("guests/fedora/network_#{network[:type]}",
+                                            options: network)
+
+            temp = Tempfile.new("vagrant")
+            temp.binmode
+            temp.write(entry)
+            temp.close
+
+            machine.communicate.upload(temp.path, "/tmp/vagrant-network-entry_#{interface}")
+          end
+
+          # Bring down all the interfaces we're reconfiguring. By bringing down
+          # each specifically, we avoid reconfiguring p7p (the NAT interface) so
+          # SSH never dies.
+          interfaces.each do |interface|
+            retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
+              machine.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}")
+              machine.communicate.sudo("/sbin/ifdown #{interface}", error_check: true)
+              machine.communicate.sudo("/sbin/ifup #{interface}")
+            end
+
+            machine.communicate.sudo("rm -f /tmp/vagrant-network-entry_#{interface}")
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/fedora/cap/flavor.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class Flavor
+        def self.flavor(machine)
+          # Read the version file
+          machine.communicate.sudo("grep VERSION_ID /etc/os-release") do |type, data|
+            version = data.split("=")[1].chomp.to_i if type == :stdout
+          end
+
+          # Detect various flavors we care about
+          if version >= 20
+            return :"fedora_#{version}"
+          else
+            return :fedora
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/fedora/cap/network_scripts_dir.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class NetworkScriptsDir
+        # The path to the directory with the network configuration scripts.
+        # This is pulled out into its own directory since there are other
+        # operating systems (SUSE) which behave similarly but with a different
+        # path to the network scripts.
+        def self.network_scripts_dir(machine)
+          "/etc/sysconfig/network-scripts"
+        end
+      end
+    end
+  end
+end

data/plugins/guests/fedora/cap/nfs_client.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class NFSClient
+        def self.nfs_client_install(machine)
+          machine.communicate.sudo("yum -y install nfs-utils nfs-utils-lib")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/fedora/guest.rb

@@ -0,0 +1,11 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestFedora
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("grep 'Fedora release [12][67890]' /etc/redhat-release")
+      end
+    end
+  end
+end

data/plugins/guests/fedora/plugin.rb

@@ -0,0 +1,41 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestFedora
+    class Plugin < Vagrant.plugin("2")
+      name "Fedora guest"
+      description "Fedora guest support."
+
+      guest("fedora", "redhat") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end     
+ 
+      guest_capability("fedora", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("fedora", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
+      guest_capability("fedora", "network_scripts_dir") do
+        require_relative "cap/network_scripts_dir"
+        Cap::NetworkScriptsDir
+      end
+
+      guest_capability("fedora", "flavor") do
+        require_relative "cap/flavor"
+        Cap::Flavor
+      end
+
+      guest_capability("fedora", "nfs_client_install") do
+        require_relative "cap/nfs_client"
+        Cap::NFSClient
+      end
+
+    end
+  end
+end

data/plugins/guests/redhat/cap/container_probe_tool.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class ContainerProbeTool
+        def self.container_probe_tool(machine)
+          machine.communicate.test("/usr/bin/container-probe-tool", sudo: true)
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/cap/register.rb

@@ -4,8 +4,8 @@ module VagrantPlugins
       class Register
         def self.register(machine)
           username = machine.config.registration.subscriber_username
-          password = machine.config.registration.subscriber_password	       
-          command = "subscription-manager register --username=#{username} --password=#{password} --auto-attach"
+          password = machine.config.registration.subscriber_password
+          command = "subscription-manager register --username=#{username} --password=#{password} --auto-attach #{"--force" if machine.config.registration.force}"
           machine.communicate.execute("cmd=$(#{command}); if [ \"$?\" != \"0\" ]; then echo $cmd | grep 'This system is already registered' || (echo $cmd 1>&2 && exit 1) ; fi", sudo: true)
         end
       end

data/plugins/guests/redhat/cap/subscription_manager.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class SubscriptionManager
+        def self.subscription_manager(machine)
+           machine.communicate.test("/sbin/subscription-manager", sudo: true)
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/plugin.rb

@@ -4,13 +4,23 @@ module VagrantPlugins
   module GuestRedHat
     class Plugin < Vagrant.plugin("2")
       guest_capability("redhat", "register") do
-	require_relative "cap/register"
-	Cap::Register
+        require_relative "cap/register"
+        Cap::Register
       end
-	
+
       guest_capability("redhat", "unregister") do
-	require_relative "cap/unregister"
-	Cap::Unregister
+        require_relative "cap/unregister"
+        Cap::Unregister
+      end
+
+      guest_capability("redhat", "subscription_manager") do
+        require_relative "cap/subscription_manager"
+        Cap::SubscriptionManager
+      end
+
+      guest_capability("redhat", "container_probe_tool") do
+        require_relative "cap/container_probe_tool"
+        Cap::ContainerProbeTool
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-registration
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Langdon White
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies: []
 description: Enables guests to have a registration capability, this is expecially
   useful on RHEL or SLES
@@ -18,32 +18,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- CHANGELOG.md
-- Gemfile
+- locales/en.yml
+- ides.sh
+- vagrant-registration.gemspec
 - LICENSE.md
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.fedora
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.rhel
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.centos
+- tests/shell-scripts/test-rhel-eco-ident/test-identification.sh
+- dummy.box
 - README.md
-- Rakefile
 - Vagrantfile
-- dummy.box
-- lib/vagrant-registration.rb
-- lib/vagrant-registration/action.rb
-- lib/vagrant-registration/action/register.rb
+- lib/vagrant-registration/plugin.rb
+- lib/vagrant-registration/errors.rb
 - lib/vagrant-registration/action/unregister.rb
+- lib/vagrant-registration/action/register.rb
 - lib/vagrant-registration/config.rb
-- lib/vagrant-registration/env.rb
-- lib/vagrant-registration/errors.rb
-- lib/vagrant-registration/plugin.rb
 - lib/vagrant-registration/version.rb
-- locales/en.yml
-- plugins/guests/redhat/cap/register.rb
-- plugins/guests/redhat/cap/unregister.rb
+- lib/vagrant-registration/env.rb
+- lib/vagrant-registration/action.rb
+- lib/vagrant-registration.rb
+- CHANGELOG.md
+- Rakefile
 - plugins/guests/redhat/plugin.rb
-- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.centos
-- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.fedora
-- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.rhel
-- tests/shell-scripts/test-rhel-eco-ident/test-identification.sh
-- vagrant-registration.gemspec
+- plugins/guests/redhat/cap/container_probe_tool.rb
+- plugins/guests/redhat/cap/unregister.rb
+- plugins/guests/redhat/cap/register.rb
+- plugins/guests/redhat/cap/subscription_manager.rb
+- plugins/guests/fedora/plugin.rb
+- plugins/guests/fedora/guest.rb
+- plugins/guests/fedora/cap/flavor.rb
+- plugins/guests/fedora/cap/nfs_client.rb
+- plugins/guests/fedora/cap/configure_networks.rb
+- plugins/guests/fedora/cap/change_host_name.rb
+- plugins/guests/fedora/cap/network_scripts_dir.rb
+- Gemfile
+- .gitignore
 homepage: 
 licenses:
 - GPL-2.0
@@ -64,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-registration
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables guests to have a registration capability