vagrant-registration 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3faa5f60610d751ab605780b28956d11a6af323
-  data.tar.gz: 0bef59c99cefb7dc5156b4d80ca841e0a82fe696
+  metadata.gz: 9a7c34f5e89fbe90dfc0194f6f467d1ef13e11bf
+  data.tar.gz: 4941f9c200a6a8f50fb14fa9c6910b5d3d51ef2e
 SHA512:
-  metadata.gz: 3a39cf4efff1c4af5a311439120d816034d649d9fba5e77f1fd28a5ab736627ed149e86b60f635c0425514f5ecd02cdbdfda88d3ef84ef7cbc6b75f32c3f0256
-  data.tar.gz: 6c65312f483594fc0bffa7e540c91b5a1ad0e84acbf375cb70c30397f0c45e4fd717a32624f63377a09c566a89ee739008233a378126816e68e8dc36b3f7be0e
+  metadata.gz: 7b322d3bf982b1e5a380f53d420be07ad83ea1e6d04ee575402daa27d204f95aa4449fdf2c26d147d9ac38810b987e0ff57a50c500865206fdae92a3bb1a3389
+  data.tar.gz: e9a80d397296c0098a1b1916e7f9351527c1e2e6269404714c015bc89834b3aa55f26bcda6a2779b53d9870fd5a2e59eeeb01aa4d121b4f895316aa6c9721762

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.0
+
+- Fix: `vagrant destroy` not triggering subscription deactivation and removal, issue #57
+- Fix: Allow auto-attach and force options to be configured
+- Fix: Remove unnecessary shebang from python script
+- Support for attaching to specified subscription pool(s), issue #36
+- Fix: rhn_register upload certificate fails, issue #60
+
 ## 1.1.0
 
 - Print warning if specifically selected manager is not available

data/README.md

@@ -133,7 +133,7 @@ description).
   config.registration.auto_attach = false
 ```
 
-Note that the `auto_attach` option is set to false when using org/activationkey for registration.
+Note that the `auto_attach` option is set to false when using org/activationkey for registration or if pools are specified.
 
 #### subscription-manager Options Reference
 
@@ -189,6 +189,12 @@ Note that the `auto_attach` option is set to false when using org/activationkey
 
   # Skip the registration (optional, skip if true, defaults to false)
   config.registration.skip
+
+  # Attach to specified pool(s) (optional)
+  #
+  # Example:
+  #   config.registration.pools = [ 'POOL-ID-1', 'POOL-ID-2' ]
+  config.registration.pools
 ```
 
 ### rhn-register Configuration

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

@@ -14,7 +14,7 @@ module VagrantPlugins
           config = env[:machine].config.registration
           guest = env[:machine].guest
 
-          if capabilities_provided?(guest) && manager_installed?(guest) && !config.skip
+          if capabilities_provided?(guest) && manager_installed?(guest, env[:ui]) && !config.skip
             env[:ui].info('Unregistering box with vagrant-registration...')
             guest.capability(:registration_unregister)
           end
@@ -42,8 +42,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

@@ -14,7 +14,7 @@ module VagrantPlugins
           config = env[:machine].config.registration
           guest = env[:machine].guest
 
-          if capabilities_provided?(guest) && manager_installed?(guest) && !config.skip && config.unregister_on_halt
+          if capabilities_provided?(guest) && manager_installed?(guest, env[:ui]) && !config.skip && config.unregister_on_halt
             env[:ui].info('Unregistering box with vagrant-registration...')
             guest.capability(:registration_unregister)
           end
@@ -43,8 +43,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/version.rb

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

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

@@ -4,15 +4,15 @@ module VagrantPlugins
       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)
+          true if machine.communicate.sudo('/usr/sbin/rhn_check')
         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)
+          machine.communicate.test('/usr/sbin/rhn_check --version') &&
+          machine.communicate.test('/usr/sbin/rhnreg_ks --version')
         end
 
         # Register the machine using 'rhnreg_ks' command, config is (Open)Struct
@@ -82,14 +82,14 @@ module VagrantPlugins
               # 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)
+              machine.communicate.sudo("echo '#{cert_file_content}' > /usr/share/rhn/#{cert_file_name}")
             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)
+          machine.communicate.sudo("sed -i 's|^sslCACert\s*=.*$|sslCACert=/usr/share/rhn/#{cert_file_name}|g' /etc/sysconfig/rhn/up2date")
         end
 
         # Build registration command that skips registration if the system is registered
@@ -101,7 +101,7 @@ module VagrantPlugins
         # 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)
+          machine.communicate.sudo("sed -i 's|^serverURL=.*$|serverURL=/usr/share/rhn/#{machine.config.registration.serverurl}|' /etc/sysconfig/rhn/up2date")
         end
 
         # The absolute path to the resource file
@@ -116,7 +116,7 @@ module VagrantPlugins
 
         # Build additional rhreg_ks options based on the plugin configuration
         def self.configuration_to_options(config)
-          config.force = true unless config.force
+          config.force = true if config.force.nil?
 
           options = []
           options << "--profilename='#{config.name}'" if config.name

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

@@ -4,14 +4,14 @@ module VagrantPlugins
       class SubscriptionManager
         # Test that the machine is already registered
         def self.subscription_manager_registered?(machine)
-          false if machine.communicate.execute("/usr/sbin/subscription-manager list --consumed | grep 'No consumed subscription pools to list'", sudo: true)
+          false if machine.communicate.sudo("/usr/sbin/subscription-manager list --consumed | grep 'No consumed subscription pools to list'")
         rescue
           true
         end
 
         # 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')
         end
 
         # Register the machine using 'register' option, config is (Open)Struct
@@ -28,11 +28,13 @@ module VagrantPlugins
           rescue Vagrant::Errors::VagrantError
             raise Vagrant::Errors::VagrantError.new, error.strip
           end
+
+          attach_pools(machine, machine.config.registration.pools)
         end
 
         # Unregister the machine using 'unregister' option
         def self.subscription_manager_unregister(machine)
-          machine.communicate.execute('subscription-manager unregister || :', sudo: true)
+          machine.communicate.sudo('subscription-manager unregister || :')
         end
 
         # Return required configuration options for subscription-manager
@@ -47,7 +49,7 @@ module VagrantPlugins
         def self.subscription_manager_options(machine)
           [:username, :password, :serverurl, :baseurl, :org, :environment,
            :name, :auto_attach, :activationkey, :servicelevel, :release,
-           :force, :type, :ca_cert]
+           :force, :type, :ca_cert, :pools]
         end
 
         # Return secret options for subscription-manager
@@ -67,9 +69,9 @@ module VagrantPlugins
             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)
+            machine.communicate.sudo("echo '#{cert_file_content}' > /etc/rhsm/ca/#{cert_file_name}")
             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)
+            machine.communicate.sudo("sed -i 's|^repo_ca_cert\s*=.*|repo_ca_cert = /etc/rhsm/ca/#{cert_file_name}|g' /etc/rhsm/rhsm.conf")
           else
             ui.warn("WARNING: Provided CA certificate file #{machine.config.registration.ca_cert} does not exist, skipping")
           end
@@ -82,13 +84,14 @@ module VagrantPlugins
 
         # Build additional subscription-manager options based on plugin configuration
         def self.configuration_to_options(config)
-          config.force = true unless config.force
+          config.force = true if config.force.nil?
 
           # --auto-attach cannot be used in case of org/activationkey registration
-          if config.org && config.activationkey
+          # or if pools are specified
+          if (config.org && config.activationkey) || config.pools
             config.auto_attach = false
           else
-            config.auto_attach = true unless config.auto_attach
+            config.auto_attach = true if config.auto_attach.nil?
           end
 
           options = []
@@ -107,6 +110,22 @@ module VagrantPlugins
           options << "--type='#{config.type}'" if config.type
           options.join(' ')
         end
+
+        # Attach subscription pools
+        def self.attach_pools(machine, pools)
+          if pools
+            command = "subscription-manager attach #{pools_to_options(pools)}"
+            machine.communicate.sudo(command)
+          end
+        end
+
+        # Return pools options for subscription-manager
+        def self.pools_to_options(pools)
+          pools = [pools] if pools.kind_of?(String)
+          pools.map do |pool|
+            "--pool=#{pool}"
+          end.join(' ')
+        end
       end
     end
   end

data/plugins/guests/redhat/plugin.rb

@@ -58,11 +58,6 @@ module VagrantPlugins
         Cap::SubscriptionManager
       end
 
-      guest_capability('redhat', 'subscription_manager_upload_certificate') do
-        require_relative 'cap/subscription_manager'
-        Cap::SubscriptionManager
-      end
-
       guest_capability('redhat', 'subscription_manager_unregister') do
         require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager

data/resources/rhn_unregister.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 import argparse
 import xmlrpclib
 import os.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-registration
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Langdon White
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables guests to be registered automatically which is especially useful
@@ -35,24 +35,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- Gemfile
-- LICENSE.md
-- README.md
-- Rakefile
 - lib/vagrant-registration.rb
-- lib/vagrant-registration/action.rb
 - lib/vagrant-registration/action/register.rb
 - lib/vagrant-registration/action/unregister_on_destroy.rb
 - lib/vagrant-registration/action/unregister_on_halt.rb
+- lib/vagrant-registration/version.rb
+- lib/vagrant-registration/action.rb
 - lib/vagrant-registration/config.rb
 - 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
+- Rakefile
+- Gemfile
+- README.md
+- CHANGELOG.md
+- LICENSE.md
 - vagrant-registration.gemspec
 homepage: https://github.com/projectatomic/adb-vagrant-registration
 licenses:
@@ -64,19 +64,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Automatic guest registration for Vagrant
 test_files: []
-has_rdoc: