vagrant-registration 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf310c73794a9dbf36ef3eecd1d3457edf2a5af
-  data.tar.gz: c4f40d9651904ff77e04a94885cb9a8ae18ab5ca
+  metadata.gz: f3faa5f60610d751ab605780b28956d11a6af323
+  data.tar.gz: 0bef59c99cefb7dc5156b4d80ca841e0a82fe696
 SHA512:
-  metadata.gz: a714e119ea6fa6ed2f9696f9f211e9f140783efa74084914a0c3258168384726c70cd3e5cbbeaabaa3945d95adbd6ae7f5b3fecaec0459924579d40d7bd254b5
-  data.tar.gz: bca6392dfa46d9220d85224b18b770f0c1a65bb5426ba09bb7ed94ac4200468606d399f256a72cf0ad02336347ca1bc38f803b913a87a4dcc735234270a8330d
+  metadata.gz: 3a39cf4efff1c4af5a311439120d816034d649d9fba5e77f1fd28a5ab736627ed149e86b60f635c0425514f5ecd02cdbdfda88d3ef84ef7cbc6b75f32c3f0256
+  data.tar.gz: 6c65312f483594fc0bffa7e540c91b5a1ad0e84acbf375cb70c30397f0c45e4fd717a32624f63377a09c566a89ee739008233a378126816e68e8dc36b3f7be0e

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.1.0
+
+- Print warning if specifically selected manager is not available
+- Support running alongside vagrant-vbguest, issue #40
+- Support rhn_register manager
+- Fix: Handle various types of configuration option values, issue #48
+- Fix: Hide password on registration failure, issue #47
+
+## 1.0.1
+
+- Fix: Set repo_ca_cert option in /etc/rhsm/rhsm.conf after uploading a certificate
+
 ## 1.0.0
 
 - Support providing a CA certificate via `config.registration.ca_cert` option

data/Gemfile

@@ -1,13 +1,13 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
-  gem "gem-compare"
-  gem "rake"
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'gem-compare'
+  gem 'rake'
 end
 
 group :plugins do
-  gem "vagrant-registration", path: "."
+  gem 'vagrant-registration', path: '.'
 end

data/README.md

@@ -23,7 +23,7 @@ If you are on Fedora, you can install the packaged version of the plugin by runn
 
 The plugin is designed in an registration-manager-agnostic way which means that plugin itself does not depend on any OS nor way of registration. vagrant-registration only calls registration capabilities for given guest, passes the configuration options to them and handles interactive registration.
 
-That being said, this plugin currently ships only with registration capability files for RHEL's Subscription Manager. Feel free to submit others.
+That being said, this plugin currently ships only with registration capability files for RHEL's Subscription Manager and `rhn_register`. Feel free to submit others.
 
 To configure the plugin, always include the configuration options mentioned in this file within the following configuration block in your Vagrantfile.
 
@@ -47,12 +47,13 @@ end
   config.registration.unregister_on_halt = false
 ```
 
-### subscription-manager Configuration
+- **manager** selects the registration manager provider. By default the plugin will use the `subscription_manager` manager, you can however change that by setting the option to a different manager:
 
-vagrant-registration supports all the options of subscription-manager's register command.
-You can set any option easily by setting `config.registration.OPTION_NAME = 'OPTION_VALUE'`
-in your Vagrantfile (please see the subscription-manager's documentation for option
-description).
+```ruby
+  config.registration.manager = 'subscription_manager'
+```
+
+### Credentials Configuration
 
 Setting up the credentials can be done as follows:
 
@@ -63,7 +64,7 @@ Vagrant.configure('2') do |config|
     config.registration.username = 'foo'
     config.registration.password = 'bar'
   end
-  
+
   # Alternatively
   if Vagrant.has_plugin?('vagrant-registration')
     config.registration.org = 'foo'
@@ -92,8 +93,30 @@ end
 
 If you do not provide credentials, you will be prompted for them in the "up process."
 
-Please note the the interactive mode asks you for the preferred registration pair only.
-In case of a subscription-manager, you would be ask on your username/password combination.
+Please note the the interactive mode asks you for the preferred registration pair only
+of the configured manager.
+
+### subscription-manager Configuration
+
+vagrant-registration will use the `subscription_manager` manager by default or can be explicitly configured by setting the `manager` option to `subscription_manager`:
+
+```ruby
+Vagrant.configure('2') do |config|
+...
+  if Vagrant.has_plugin?('vagrant-registration')
+    config.registration.manager = 'subscription_manager'
+  end
+...
+end
+```
+
+In case of `subscription_manager` manager for the preferred registration pair,
+you would be ask on your username/password combination.
+
+vagrant-registration supports all the options of subscription-manager's register command.
+You can set any option easily by setting `config.registration.OPTION_NAME = 'OPTION_VALUE'`
+in your Vagrantfile (please see the subscription-manager's documentation for option
+description).
 
 #### subscription-manager Default Options
 
@@ -102,10 +125,10 @@ In case of a subscription-manager, you would be ask on your username/password co
 ```ruby
   config.registration.force = false
 ```
+
 - **--auto-attach**: Vagrant would fail to install packages on registered RHEL system if the subscription is not attached, therefore vagrant-registration appends the
 `--auto-attach` flag automatically when subscribing. To disable this option, set `auto_attach` option to `false`:
 
-
 ```ruby
   config.registration.auto_attach = false
 ```
@@ -168,21 +191,125 @@ Note that the `auto_attach` option is set to false when using org/activationkey
   config.registration.skip
 ```
 
+### rhn-register Configuration
+
+vagrant-registration will use the `rhn_register` manager only if explicitly configured by setting the `manager` option to `rhn_register`:
+
+```ruby
+Vagrant.configure('2') do |config|
+...
+  if Vagrant.has_plugin?('vagrant-registration')
+    config.registration.manager = 'rhn_register'
+  end
+...
+end
+```
+
+In case of a `rhn_register` manager, the preferred registration pair is the username/password/serverurl combination.
+
+vagrant-registration supports most of the options of rhnreg_ks's command. You can set any option easily by setting `config.registration.OPTION_NAME = 'OPTION_VALUE'` in your Vagrantfile (please see the `rhnreg_ks`'s documentation for option description).
+
+`rhn_register` manager reuses the naming of `subscription-manager`'s command options where possible.
+
+#### rhn-register Default Options
+
+- **--force**: `rhnreg_ks` command will fail if you attempt to register an already registered machine (see the man page for explanation), therefore vagrant-registration appends the `--force` flag automatically when subscribing. If you would like to disable this feature, set `force` option to `false`:
+
+```ruby
+  config.registration.force = false
+```
+
+#### rhn-register Options Reference
+
+```ruby
+  # The username to register the system with under Spacewalk Server, Red Hat Satellite or
+  # Red Hat Network Classic. This can be an existing Spacewalk, Red Hat Satellite or
+  # Red Hat Network Classic username, or a new  user‐name.
+  config.registration.username
+
+  # The password associated with the username specified with the `--username` option.
+  # This is an unencrypted password.
+  config.registration.password
+
+  # Give the URL of the subscription service to use (required for registering a
+  # system with the "Spacewalk Server", "Red Hat Satellite" or "Red Hat Network Classic").
+  # The configuration name is mapped to the `--serverUrl` option of rhnreg_ks command.
+  #
+  # The serverurl is mandatory and if you do not provide a value,
+  # you will be prompted for them in the "up process."
+  config.registration.serverurl
+
+  # A path to a CA certificate file (optional)
+  # The configuration name is mapped to the `--sslCACert` option of rhnreg_ks command.
+  #
+  # The CA certificate file is be uploaded to /usr/share/rhn/<ca_file_name> in guest
+  # and the configuration  in `/etc/sysconfig/rhn/up2date` is updated to:
+  # `sslCACert=/usr/share/rhn/<ca_file_name>`
+  #
+  # As default only the configuration in `/etc/sysconfig/rhn/up2date` is updated
+  # to point to the CA certificate file that is present on Fedora, CentOS and RHEL:
+  # `sslCACert=/usr/share/rhn/RHNS-CA-CERT`
+  config.registration.ca_cert
+
+  # Give the organization to which to join the system (required, except for
+  # hosted environments)
+  # The configuration name is mapped to the `--systemorgid` option of rhnreg_ks command.
+  config.registration.org
+
+  # Name of the subscribed system (optional, defaults to hostname if unset)
+  # The configuration name is mapped to the `--profilename` option of rhnreg_ks command.
+  config.registration.name
+
+  # Attach existing subscriptions as part of the registration process (optional)
+  config.registration.activationkey
+
+  # Subscribe this system to the EUS channel tied to the system's redhat-release (optional)
+  config.registration.use_eus_channel
+
+  # Do not probe or upload any hardware info (optional)
+  config.registration.nohardware
+
+  #  Do not profile or upload any package info (optional)
+  config.registration.nopackages
+
+  # Do not upload any virtualization info (optional)
+  config.registration.novirtinfo
+
+  # Do not start rhnsd after completion (optional)
+  config.registration.norhnsd
+
+  # Force the registration (optional, force if true, defaults to true)
+  config.registration.force
+
+  # Skip the registration (optional, skip if true, defaults to false)
+  config.registration.skip
+```
+
 ## Tests
 
-Tests currently test the plugin with `subscription-manager` on RHEL 7.1 guest
-and Fedora host. You need an imported RHEL 7.1 Vagrant box named `rhel-7.1`.
+Tests currently test the plugin with `subscription-manager` and  `rhn_register` on RHEL 7.1 guest and Fedora host. You need an imported RHEL 7.1 Vagrant box named `rhel-7.1`.
 
 To run them:
 
 ```
+export VAGRANT_REGISTRATION_MANAGER=
 export VAGRANT_REGISTRATION_USERNAME=
 export VAGRANT_REGISTRATION_PASSWORD=
 export VAGRANT_REGISTRATION_ORG=
 export VAGRANT_REGISTRATION_ACTIVATIONKEY=
+export VAGRANT_REGISTRATION_SERVERURL=
+export VAGRANT_REGISTRATION_CA_CERT=
 ./tests/run.sh
+./tests/run_rhn_register.sh
+```
+
+To show the Vagrant output on the console during the tests run, set the `DEBUG`
+environment variable on `1` before executing the test script:
+
+```
+export DEBUG=1
 ```
 
 ## Acknowledgements
 
-The project would like to make sure we thank [purpleidea](https://github.com/purpleidea/), [humaton](https://github.com/humaton/), [strzibny](https://github.com/strzibny), [scollier](https://github.com/scollier/), [puzzle](https://github.com/puzzle), [voxik](https://github.com/voxik), [lukaszachy](https://github.com/lukaszachy) and [goern](https://github.com/goern) (in no particular order) for their contributions of ideas, code and testing for this project.
+The project would like to make sure we thank [purpleidea](https://github.com/purpleidea/), [humaton](https://github.com/humaton/), [strzibny](https://github.com/strzibny), [scollier](https://github.com/scollier/), [puzzle](https://github.com/puzzle), [voxik](https://github.com/voxik), [lukaszachy](https://github.com/lukaszachy), [goern](https://github.com/goern), [iconoeugen](https://github.com/iconoeugen)  and [pvalena](https://github.com/pvalena) (in no particular order) for their contributions of ideas, code and testing for this project.

data/lib/vagrant-registration.rb

@@ -12,6 +12,6 @@ module VagrantPlugins
     end
 
     # Temporally load the extra capability files for Red Hat
-    load(File.join(self.source_root, 'plugins/guests/redhat/plugin.rb'))
+    load(File.join(source_root, 'plugins/guests/redhat/plugin.rb'))
   end
 end

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

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module Registration
@@ -11,14 +11,17 @@ module VagrantPlugins
         end
 
         def call(env)
-          @app.call(env)
+          # Vbguest plugin (if present) is called next. Therefore registration
+          # needs to be done first. This does not work with the default
+          # 'action_register' hook.
+          @app.call(env) unless Plugin.vbguest_plugin?
 
           # Configuration from Vagrantfile
           config = env[:machine].config.registration
           machine = env[:machine]
           guest = env[:machine].guest
 
-          if should_register?(machine)
+          if should_register?(machine, env[:ui])
             env[:ui].info('Registering box with vagrant-registration...')
             check_configuration_options(machine, env[:ui])
 
@@ -38,15 +41,17 @@ module VagrantPlugins
           end
 
           @logger.debug('Registration is skipped due to the configuration') if config.skip
+
+          @app.call(env) if Plugin.vbguest_plugin?
         end
 
         private
 
         # Shall we register the box?
-        def should_register?(machine)
+        def should_register?(machine, ui)
           !machine.config.registration.skip &&
           capabilities_provided?(machine.guest) &&
-          manager_installed?(machine.guest) &&
+          manager_installed?(machine.guest, ui) &&
           !machine.guest.capability(:registration_registered?)
         end
 
@@ -58,8 +63,8 @@ module VagrantPlugins
           options = machine.config.registration.conf.each_pair.map { |pair| pair[0] }
 
           if unsupported_options_provided?(manager, available_options, options, ui)
-            ui.warn("WARNING: #{manager} supports only the following options:" +
-                    "\nWARNING: " + available_options.join(', '))
+            ui.warn("WARNING: #{manager} supports only the following options:" \
+                    "\nWARNING: #{available_options.join(', ')}")
           end
         end
 
@@ -68,7 +73,7 @@ module VagrantPlugins
           warned = false
           options.each do |option|
             unless available_options.include? option
-              ui.warn("WARNING: #{option} option is not supported for " + manager)
+              ui.warn("WARNING: #{option} option is not supported for #{manager}")
               warned = true
             end
           end
@@ -88,8 +93,8 @@ module VagrantPlugins
         end
 
         # Check if selected registration manager is installed
-        def manager_installed?(guest)
-          if guest.capability(:registration_manager_installed)
+        def manager_installed?(guest, ui)
+          if guest.capability(:registration_manager_installed, ui)
             true
           else
             @logger.debug('Registration manager not found on guest')

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

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module Registration
@@ -20,7 +20,7 @@ module VagrantPlugins
           end
 
           @logger.debug('Unregistration is skipped due to the configuration') if config.skip
-          @logger.debug('Unregistration is skipped on halt due to the configuration') if !config.unregister_on_halt
+          @logger.debug('Unregistration is skipped on halt due to the configuration') unless config.unregister_on_halt
           @app.call(env)
 
         # Guest might not be available after halting, so log the exception and continue

data/lib/vagrant-registration/config.rb

@@ -1,5 +1,5 @@
-require "vagrant"
-require "ostruct"
+require 'vagrant'
+require 'ostruct'
 
 module VagrantPlugins
   module Registration
@@ -34,9 +34,11 @@ module VagrantPlugins
         @conf = OpenStruct.new if @conf == UNSET_VALUE
       end
 
+      # Serialize strings, nil and boolean values, symbols, arrays and hashes
+      # to be used within eval()
       def adjust_arguments(args)
         return '' if args.size < 1
-        args.map { |a| a.is_a?(String) ? "'#{a}'" : a }.join(',')
+        args.inspect[1..-2]
       end
     end
   end

data/lib/vagrant-registration/plugin.rb

@@ -14,10 +14,22 @@ module VagrantPlugins
   module Registration
     class Plugin < Vagrant.plugin('2')
       class << self
+
+        # Vbguest plugin updates GuestAdditions for VirtualBox before
+        # '::Vagrant::Action::Builtin::SyncedFolders' and therefore needs
+        # to be registered. Prepending Vbguest hook ensures that, but this
+        # is done only with Vbguest plugin and VirtualBox provider. In other
+        # cases the behavior is unchanged.
         def register(hook)
           setup_logging
-          hook.after(::Vagrant::Action::Builtin::SyncedFolders,
-                     VagrantPlugins::Registration::Action.action_register)
+
+          if vbguest_plugin?
+            hook.before(::VagrantVbguest::Middleware,
+                                 VagrantPlugins::Registration::Action.action_register)
+          else
+            hook.after(::Vagrant::Action::Builtin::SyncedFolders,
+                               VagrantPlugins::Registration::Action.action_register)
+          end
         end
 
         def unregister_on_halt(hook)
@@ -74,6 +86,14 @@ module VagrantPlugins
           logger = nil
         end
       end
+
+      # Determines if both VirtualBox provider and Vbguest plugin are present.
+      def self.vbguest_plugin?
+        @@vbguest_plugin ||= (
+          defined?(VagrantPlugins::ProviderVirtualBox::Provider) &&
+          defined?(VagrantVbguest::Middleware)
+        )
+      end
     end
   end
 end

data/lib/vagrant-registration/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Registration plugin to auto-register guests on `vagrant up`
   module Registration
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

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

@@ -2,7 +2,7 @@ module VagrantPlugins
   module GuestRedHat
     module Cap
       # Common configuration options for all managers
-      DEFAULT_CONFIGURATION_OPTIONS = [:skip, :unregister_on_halt]
+      DEFAULT_CONFIGURATION_OPTIONS = [:manager, :skip, :unregister_on_halt]
 
       # This provides registration capabilities for vagrant-registration
       #
@@ -12,7 +12,7 @@ module VagrantPlugins
       class Registration
         # Is the machine already registered?
         def self.registration_registered?(machine)
-          cap = "#{self.registration_manager(machine).to_s}_registered?".to_sym
+          cap = "#{registration_manager(machine)}_registered?".to_sym
           if machine.guest.capability?(cap)
             machine.guest.capability(cap)
           else
@@ -22,7 +22,7 @@ module VagrantPlugins
 
         # Register the given machine
         def self.registration_register(machine, ui)
-          cap = "#{self.registration_manager(machine).to_s}_register".to_sym
+          cap = "#{registration_manager(machine)}_register".to_sym
           if machine.guest.capability?(cap)
             machine.guest.capability(cap, ui)
           else
@@ -32,7 +32,7 @@ module VagrantPlugins
 
         # Unregister the given machine
         def self.registration_unregister(machine)
-          cap = "#{self.registration_manager(machine).to_s}_unregister".to_sym
+          cap = "#{registration_manager(machine)}_unregister".to_sym
           if machine.guest.capability?(cap)
             machine.guest.capability(cap)
           else
@@ -41,13 +41,14 @@ module VagrantPlugins
         end
 
         # Check that the machine has the selected registration manager installed
-        def self.registration_manager_installed(machine)
-          cap = "#{self.registration_manager(machine).to_s}".to_sym
-          if machine.guest.capability?(cap)
-            machine.guest.capability(cap)
-          else
-            false
+        # and warn if the user specifically selected a manager that is not available
+        def self.registration_manager_installed(machine, ui)
+          cap = "#{registration_manager(machine)}".to_sym
+          return machine.guest.capability(cap) if machine.guest.capability?(cap)
+          if machine.config.registration.manager != ''
+            ui.error("WARNING: Selected registration manager #{machine.config.registration.manager} is not available, skipping.")
           end
+          false
         end
 
         # Required configuration options of the registration manager
@@ -57,7 +58,7 @@ module VagrantPlugins
         #
         # e.g. [[:username, :password]]
         def self.registration_credentials(machine)
-          cap = "#{self.registration_manager(machine).to_s}_credentials".to_sym
+          cap = "#{registration_manager(machine)}_credentials".to_sym
           if machine.guest.capability?(cap)
             machine.guest.capability(cap)
           else
@@ -68,7 +69,7 @@ module VagrantPlugins
         # Return all available options for a given registration manager together
         # with general options available to any.
         def self.registration_options(machine)
-          cap = "#{self.registration_manager(machine).to_s}_options".to_sym
+          cap = "#{registration_manager(machine)}_options".to_sym
           if machine.guest.capability?(cap)
             DEFAULT_CONFIGURATION_OPTIONS + machine.guest.capability(cap)
           else
@@ -78,7 +79,7 @@ module VagrantPlugins
 
         # Return secret options for the registration manager
         def self.registration_secrets(machine)
-          cap = "#{self.registration_manager(machine).to_s}_secrets".to_sym
+          cap = "#{registration_manager(machine)}_secrets".to_sym
           if machine.guest.capability?(cap)
             machine.guest.capability(cap)
           else

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

@@ -0,0 +1,139 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class RhnRegister
+        # Test that the machine is already registered
+        def self.rhn_register_registered?(machine)
+          true if machine.communicate.execute('/usr/sbin/rhn_check', sudo: true)
+        rescue
+          false
+        end
+
+        # Test that we have rhn installed
+        def self.rhn_register(machine)
+          machine.communicate.test('/usr/sbin/rhn_check --version', sudo: true) &&
+          machine.communicate.test('/usr/sbin/rhnreg_ks --version', sudo: true)
+        end
+
+        # Register the machine using 'rhnreg_ks' command, config is (Open)Struct
+        def self.rhn_register_register(machine, ui)
+          rhn_register_upload_certificate(machine, ui)
+          rhn_register_server_url(machine, ui) if machine.config.registration.serverurl
+          command = "rhnreg_ks #{configuration_to_options(machine.config.registration)}"
+
+          # Handle exception to avoid displaying password
+          begin
+            error = String.new
+            machine.communicate.sudo(registration_command(command)) do |type, data|
+              error += "#{data}" if type == :stderr
+            end
+          rescue Vagrant::Errors::VagrantError
+            raise Vagrant::Errors::VagrantError.new, error.strip
+          end
+        end
+
+        # Unregister the machine using 'rhn_unregister.py' resource script
+        def self.rhn_register_unregister(machine)
+          machine.communicate.tap do |comm|
+            tmp = '/tmp/rhn_unregister'
+            system_id = '/etc/sysconfig/rhn/systemid'
+            server_url = machine.config.registration.serverurl
+            # Generate the API URL
+            server_url = server_url.sub(/XMLRPC$/, 'rpc/api')
+            comm.sudo("rm -f #{tmp}", error_check: false)
+            comm.upload(resource('rhn_unregister.py'), tmp)
+            comm.sudo("python #{tmp} -s #{server_url} -f #{system_id}")
+            comm.sudo("rm -f #{tmp}")
+            # Guest still thinks it is a part of RHN network until systemdid file is removed
+            comm.sudo("rm -f #{system_id}")
+          end
+        end
+
+        # Return required configuration options for rhn register
+        #
+        # For rhn_register the Server URL is mandatory and must be always
+        # provided together with the credentials
+        def self.rhn_register_credentials(machine)
+          [[:username, :password, :serverurl], [:org, :activationkey, :serverurl]]
+        end
+
+        # Return all available options for rhn register
+        def self.rhn_register_options(machine)
+          [:name, :username, :password, :org, :serverurl, :ca_cert,
+           :activationkey, :use_eus_channel, :nohardware, :nopackages,
+           :novirtinfo, :norhnsd, :force]
+        end
+
+        # Return secret options for rhreg_ks
+        def self.rhn_register_secrets(manager)
+          [:password]
+        end
+
+        private
+
+        # Upload provided SSL CA cert to the standard /usr/share/rhn/ path on the guest
+        # and configure the correct path in `up2date` system configuration
+        def self.rhn_register_upload_certificate(machine, ui)
+          # Set as the default CA certificate file that is present on Fedora, CentOS and RHEL
+          cert_file_name = 'RHNS-CA-CERT'
+          if machine.config.registration.ca_cert
+            ui.info("Uploading CA certificate from #{machine.config.registration.ca_cert}...")
+            if File.exist?(machine.config.registration.ca_cert)
+              # Make sure the provided CA certificate file will be configured
+              cert_file_name = File.basename(machine.config.registration.ca_cert)
+              cert_file_content = File.read(machine.config.registration.ca_cert, tmp)
+              machine.communicate.execute("echo '#{cert_file_content}' > /usr/share/rhn/#{cert_file_name}", sudo: true)
+            else
+              ui.warn("WARNING: Provided CA certificate file #{machine.config.registration.ca_cert} does not exist, skipping")
+            end
+          end
+          # Make sure the correct CA certificate file is always configured
+          ui.info("Updating CA certificate to /usr/share/rhn/#{cert_file_name}`...")
+          machine.communicate.execute("sed -i 's|^sslCACert\s*=.*$|sslCACert=/usr/share/rhn/#{cert_file_name}|g' /etc/sysconfig/rhn/up2date", sudo: true)
+        end
+
+        # Build registration command that skips registration if the system is registered
+        def self.registration_command(command)
+          "cmd=$(#{command}); if [ \"$?\" != \"0\" ]; then echo $cmd | grep 'This system is already registered' || (echo $cmd 1>&2 && exit 1) ; fi"
+        end
+
+        # Update configuration file '/etc/sysconfig/rhn/up2date' with
+        # provided server URL
+        def self.rhn_register_server_url(machine, ui)
+          ui.info("Update server URL to #{machine.config.registration.serverurl}...")
+          machine.communicate.execute("sed -i 's|^serverURL=.*$|serverURL=/usr/share/rhn/#{machine.config.registration.serverurl}|' /etc/sysconfig/rhn/up2date", sudo: true)
+        end
+
+        # The absolute path to the resource file
+        def self.resource(name)
+          File.join(resource_root, name)
+        end
+
+        # The absolute path to the resource directory
+        def self.resource_root
+          File.expand_path('../../../../../resources', __FILE__)
+        end
+
+        # Build additional rhreg_ks options based on the plugin configuration
+        def self.configuration_to_options(config)
+          config.force = true unless config.force
+
+          options = []
+          options << "--profilename='#{config.name}'" if config.name
+          options << "--username='#{config.username}'" if config.username
+          options << "--password='#{config.password}'" if config.password
+          options << "--systemorgid='#{config.org}'" if config.org
+          options << "--serverUrl='#{config.serverurl}'" if config.serverurl
+          options << "--activationkey='#{config.activationkey}'" if config.activationkey
+          options << '--use-eus-channel' if config.use_eus_channel
+          options << '--nohardware' if config.nohardware
+          options << '--nopackages' if config.nopackages
+          options << '--novirtinfo' if config.novirtinfo
+          options << '--norhnsd' if config.norhnsd
+          options << '--force' if config.force
+          options.join(' ')
+        end
+      end
+    end
+  end
+end

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

@@ -11,37 +11,28 @@ module VagrantPlugins
 
         # Test that we have subscription-manager installed
         def self.subscription_manager(machine)
-          machine.communicate.test("/usr/sbin/subscription-manager", sudo: true)
+          machine.communicate.test('/usr/sbin/subscription-manager', sudo: true)
         end
 
         # Register the machine using 'register' option, config is (Open)Struct
         def self.subscription_manager_register(machine, ui)
           subscription_manager_upload_certificate(machine, ui) if machine.config.registration.ca_cert
           command = "subscription-manager register #{configuration_to_options(machine.config.registration)}"
-          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
 
-        # Upload provided CA cert to the standard /etc/rhsm/ca path on the guest
-        #
-        # Since subscription-manager recognizes only .pem files, we rename those
-        # files not ending with '.pem' extension.
-        def self.subscription_manager_upload_certificate(machine, ui)
-          ui.info("Uploading CA certificate from #{machine.config.registration.ca_cert}...")
-          if File.exist?(machine.config.registration.ca_cert)
-            cert_file_content = File.read(machine.config.registration.ca_cert)
-            cert_file_name = File.basename(machine.config.registration.ca_cert)
-            cert_file_name = "#{cert_file_name}.pem" unless cert_file_name.end_with? '.pem'
-            machine.communicate.execute("echo '#{cert_file_content}' > /etc/rhsm/ca/#{cert_file_name}", sudo: true)
-            ui.info('Setting repo_ca_cert option in /etc/rhsm/rhsm.conf...')
-            machine.communicate.execute("sed -i 's|^repo_ca_cert\s*=.*|repo_ca_cert = /etc/rhsm/ca/#{cert_file_name}|g' /etc/rhsm/rhsm.conf", sudo: true)
-          else
-            ui.warn("WARNING: Provided CA certificate file #{machine.config.registration.ca_cert} does not exist, skipping")
+          # Handle exception to avoid displaying password
+          begin
+            error = String.new
+            machine.communicate.sudo(registration_command(command)) do |type, data|
+              error += "#{data}" if type == :stderr
+            end
+          rescue Vagrant::Errors::VagrantError
+            raise Vagrant::Errors::VagrantError.new, error.strip
           end
-       end
+        end
 
         # Unregister the machine using 'unregister' option
         def self.subscription_manager_unregister(machine)
-          machine.communicate.execute("subscription-manager unregister || :", sudo: true)
+          machine.communicate.execute('subscription-manager unregister || :', sudo: true)
         end
 
         # Return required configuration options for subscription-manager
@@ -66,6 +57,29 @@ module VagrantPlugins
 
         private
 
+        # Upload provided CA cert to the standard /etc/rhsm/ca path on the guest
+        #
+        # Since subscription-manager recognizes only .pem files, we rename those
+        # files not ending with '.pem' extension.
+        def self.subscription_manager_upload_certificate(machine, ui)
+          ui.info("Uploading CA certificate from #{machine.config.registration.ca_cert}...")
+          if File.exist?(machine.config.registration.ca_cert)
+            cert_file_content = File.read(machine.config.registration.ca_cert)
+            cert_file_name = File.basename(machine.config.registration.ca_cert)
+            cert_file_name = "#{cert_file_name}.pem" unless cert_file_name.end_with? '.pem'
+            machine.communicate.execute("echo '#{cert_file_content}' > /etc/rhsm/ca/#{cert_file_name}", sudo: true)
+            ui.info('Setting repo_ca_cert option in /etc/rhsm/rhsm.conf...')
+            machine.communicate.execute("sed -i 's|^repo_ca_cert\s*=.*|repo_ca_cert = /etc/rhsm/ca/#{cert_file_name}|g' /etc/rhsm/rhsm.conf", sudo: true)
+          else
+            ui.warn("WARNING: Provided CA certificate file #{machine.config.registration.ca_cert} does not exist, skipping")
+          end
+        end
+
+        # Build registration command that skips registration if the system is registered
+        def self.registration_command(command)
+          "cmd=$(#{command}); if [ \"$?\" != \"0\" ]; then echo $cmd | grep 'This system is already registered' || (echo $cmd 1>&2 && exit 1) ; fi"
+        end
+
         # Build additional subscription-manager options based on plugin configuration
         def self.configuration_to_options(config)
           config.force = true unless config.force
@@ -85,11 +99,11 @@ module VagrantPlugins
           options << "--org='#{config.org}'" if config.org
           options << "--environment='#{config.environment}'" if config.environment
           options << "--name='#{config.name}'" if config.name
-          options << "--auto-attach" if config.auto_attach
+          options << '--auto-attach' if config.auto_attach
           options << "--activationkey='#{config.activationkey}'" if config.activationkey
           options << "--servicelevel='#{config.servicelevel}'" if config.servicelevel
           options << "--release='#{config.release}'" if config.release
-          options << "--force" if config.force
+          options << '--force' if config.force
           options << "--type='#{config.type}'" if config.type
           options.join(' ')
         end

data/plugins/guests/redhat/plugin.rb

@@ -59,7 +59,7 @@ module VagrantPlugins
       end
 
       guest_capability('redhat', 'subscription_manager_upload_certificate') do
-        require_relative "cap/subscription_manager"
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
 
@@ -82,6 +82,41 @@ module VagrantPlugins
         require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
+
+      guest_capability('redhat', 'rhn_register') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_registered?') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_register') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_unregister') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_credentials') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_options') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
+
+      guest_capability('redhat', 'rhn_register_secrets') do
+        require_relative 'cap/rhn_register'
+        Cap::RhnRegister
+      end
     end
   end
 end

data/resources/rhn_unregister.py

@@ -0,0 +1,43 @@
+#!/usr/bin/python
+import argparse
+import xmlrpclib
+import os.path
+import sys
+
+def main():
+  parser = argparse.ArgumentParser(description="Unregister the system from Spacewalk Server, Red Hat Satellite or Red Hat Network Classic.")
+  parser.add_argument("-s", "--serverurl", dest="server_url", type=str, required=True,
+                      help="Specify a URL to as the server.")
+  parser.add_argument("-f", "--file", dest="system_id", type=str, default='/etc/sysconfig/rhn/systemid',
+                      help="Specify a path to the RHN systemid file.")
+
+  args = parser.parse_args()
+
+  try:
+    if not os.path.exists(args.system_id):
+      print "System is not registered to RHN"
+      return 1
+    client =  xmlrpclib.Server(args.server_url)
+    client.system.delete_system(open(args.system_id).read())
+  except xmlrpclib.ProtocolError as err:
+    print "A fault occurred"
+    print "Fault string: %s" % err
+    return 1
+  except xmlrpclib.Fault as err:
+    print "A fault occurred"
+    print "Fault code: %d" % err.faultCode
+    print "Fault string: %s" % err.faultString
+    return 1
+  except IOError as err:
+    print "A fault occurred"
+    print "Fault string: %s" % err
+    return 1
+  except Exception as e:
+    print "A fault occurred"
+    print "Fault: %s" % e
+    return 1
+  print "Unregister successful"
+  return 0
+
+if __name__ == "__main__":
+    sys.exit(main())

data/vagrant-registration.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   # Note that the entire gitignore(5) syntax is not supported, specifically
   # the '!' syntax, but it should mostly work correctly.
   root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) {
+  all_files      = Dir.chdir(root_path) do
     Dir.glob('lib/**/{*,.*}') +
     Dir.glob('plugins/**/{*,.*}') +
+    Dir.glob('resources/**/{*,.*}') +
     ['Rakefile', 'Gemfile', 'README.md', 'CHANGELOG.md', 'LICENSE.md', 'vagrant-registration.gemspec']
-  }
+  end
   all_files.reject! { |file| ['.', '..'].include?(File.basename(file)) }
   gitignore_path = File.join(root_path, '.gitignore')
   gitignore      = File.readlines(gitignore_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-registration
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Langdon White
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -49,8 +49,10 @@ files:
 - lib/vagrant-registration/plugin.rb
 - lib/vagrant-registration/version.rb
 - plugins/guests/redhat/cap/registration.rb
+- plugins/guests/redhat/cap/rhn_register.rb
 - plugins/guests/redhat/cap/subscription_manager.rb
 - plugins/guests/redhat/plugin.rb
+- resources/rhn_unregister.py
 - vagrant-registration.gemspec
 homepage: https://github.com/projectatomic/adb-vagrant-registration
 licenses: