kitchen-puppet 0.0.16 → 0.0.17

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -25,11 +25,9 @@ require 'kitchen/provisioner/base'
 require 'kitchen/provisioner/puppet/librarian'
 
 module Kitchen
-
   class Busser
-
     def non_suite_dirs
-      %w{data data_bags environments nodes roles puppet}
+      %w(data data_bags environments nodes roles puppet)
     end
   end
 
@@ -39,23 +37,23 @@ module Kitchen
     #
     class PuppetAgent < Base
       attr_accessor :tmp_dir
-      
+
       default_config :require_puppet_omnibus, false
-      # TODO use something like https://github.com/fnichol/omnibus-puppet
+      # TODO: use something like https://github.com/fnichol/omnibus-puppet
       default_config :puppet_omnibus_url, nil
       default_config :puppet_omnibus_remote_path, '/opt/puppet'
       default_config :puppet_version, nil
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
-      
-      default_config :puppet_apt_repo, "http://apt.puppetlabs.com/puppetlabs-release-precise.deb"
-      default_config :puppet_yum_repo, "https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm"
-      default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
+
+      default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
+      default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
+      default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
 
       default_config :puppet_agent_command, nil
 
       default_config :puppet_config_path do |provisioner|
-          provisioner.calculate_path('puppet.conf', :file)
+        provisioner.calculate_path('puppet.conf', :file)
       end
 
       default_config :puppet_debug, false
@@ -65,7 +63,7 @@ module Kitchen
       default_config :update_package_repos, true
 
       default_config :custom_facts, {}
-      
+
       default_config :puppet_detailed_exitcodes, nil
       default_config :puppet_logdest, nil
       default_config :puppet_masterport, nil
@@ -76,8 +74,7 @@ module Kitchen
       default_config :puppet_waitforcert, '0'
       default_config :puppet_certname, nil
       default_config :puppet_digest, nil
-      
-      
+
       def calculate_path(path, type = :directory)
         base = config[:test_base_path]
         candidates = []
@@ -91,80 +88,82 @@ module Kitchen
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def install_command
-        return unless config[:require_puppet_omnibus] or config[:require_puppet_repo]
+        return unless config[:require_puppet_omnibus] || config[:require_puppet_repo]
         if config[:require_puppet_omnibus]
-          info("Installing puppet using puppet omnibus")
-          version = if !config[:puppet_version].nil?
-            "-v #{config[:puppet_version]}"
+          info('Installing puppet using puppet omnibus')
+          if !config[:puppet_version].nil?
+            version = "-v #{config[:puppet_version]}"
           else
-            ""
+            version = ''
           end
           <<-INSTALL
-          #{Util.shell_helpers}
+            #{Util.shell_helpers}
 
-          if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
-            echo "-----> Installing Puppet Omnibus"
-            do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
-            #{sudo('sh')} /tmp/puppet_install.sh #{version}
-          fi
-          #{install_busser}
+            if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
+              echo "-----> Installing Puppet Omnibus"
+              do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
+              #{sudo('sh')} /tmp/puppet_install.sh #{version}
+            fi
+            #{install_busser}
           INSTALL
         else
           case puppet_platform
-          when "debian", "ubuntu"
-          info("Installing puppet on #{puppet_platform}")
-          <<-INSTALL
-          if [ ! $(which puppet) ]; then
-            #{sudo('wget')} #{puppet_apt_repo}
-            #{sudo('dpkg')} -i #{puppet_apt_repo_file}
-            #{update_packages_debian_cmd}
-            #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
-            #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
-          fi
-          #{install_busser}
-          INSTALL
-                 when "redhat", "centos", "fedora"
-                  info("Installing puppet on #{puppet_platform}")
-          <<-INSTALL
-          if [ ! $(which puppet) ]; then
-            #{sudo('rpm')} -ivh #{puppet_yum_repo}
-                    #{update_packages_redhat_cmd}
-            #{sudo('yum')} -y install puppet#{puppet_redhat_version}
-          fi
-          #{install_busser}
-          INSTALL
-         else
-          info("Installing puppet, will try to determine platform os")
-          <<-INSTALL
-          if [ ! $(which puppet) ]; then
-            if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
-               #{sudo('rpm')} -ivh #{puppet_yum_repo}
-               #{update_packages_redhat_cmd}
-               #{sudo('yum')} -y install puppet#{puppet_redhat_version}
-            else
-               if [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then 
+          when 'debian', 'ubuntu'
+            info("Installing puppet on #{puppet_platform}")
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                #{sudo('wget')} #{puppet_apt_repo}
+                #{sudo('dpkg')} -i #{puppet_apt_repo_file}
+                #{update_packages_debian_cmd}
+                #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
+                #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
+              fi
+              #{install_busser}
+            INSTALL
+          when 'redhat', 'centos', 'fedora'
+            info("Installing puppet on #{puppet_platform}")
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                #{sudo('rpm')} -ivh #{puppet_yum_repo}
+                #{update_packages_redhat_cmd}
+                #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+              fi
+              #{install_busser}
+            INSTALL
+          else
+            info('Installing puppet, will try to determine platform os')
+            <<-INSTALL
+              if [ ! $(which puppet) ]; then
+                if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
                   #{sudo('rpm')} -ivh #{puppet_yum_repo}
                   #{update_packages_redhat_cmd}
-                  #{sudo('yum')} -y install puppet#{puppet_redhat_version}            
-               else
-                  #{sudo('wget')} #{puppet_apt_repo}
-                  #{sudo('dpkg')} -i #{puppet_apt_repo_file}
-                  #{update_packages_debian_cmd}
-                  #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
-                  #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
-               fi   
-            fi
-          fi
-          #{install_busser}
-          INSTALL
-         end
+                  #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+                else
+                  if [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then
+                    #{sudo('rpm')} -ivh #{puppet_yum_repo}
+                    #{update_packages_redhat_cmd}
+                    #{sudo('yum')} -y install puppet#{puppet_redhat_version}
+                  else
+                    #{sudo('wget')} #{puppet_apt_repo}
+                    #{sudo('dpkg')} -i #{puppet_apt_repo_file}
+                    #{update_packages_debian_cmd}
+                    #{sudo('apt-get')} -y install puppet-common#{puppet_debian_version}
+                    #{sudo('apt-get')} -y install puppet#{puppet_debian_version}
+                  fi
+                fi
+              fi
+              #{install_busser}
+            INSTALL
+          end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def install_busser
-	    if config[:require_chef_for_busser]
-          <<-INSTALL
+        return unless config[:require_chef_for_busser]
+        <<-INSTALL
           #{Util.shell_helpers}
           # install chef omnibus so that busser works as this is needed to run tests :(
           # TODO: work out how to install enough ruby
@@ -176,190 +175,186 @@ module Kitchen
             do_download #{chef_url} /tmp/install.sh
             #{sudo('sh')} /tmp/install.sh
           fi
-          INSTALL
-        end
-	  end	
-		  
-		  
+        INSTALL
+      end
 
-        def init_command
-        end
+      def init_command
+      end
 
-        def create_sandbox
-          super
-          debug("Creating local sandbox in #{sandbox_path}")
+      def create_sandbox
+        super
+        debug("Creating local sandbox in #{sandbox_path}")
 
-          yield if block_given?
+        yield if block_given?
 
-          prepare_puppet_config
-          info('Finished Preparing files for transfer')
+        prepare_puppet_config
+        info('Finished Preparing files for transfer')
+      end
 
-        end
+      def cleanup_sandbox
+        return if sandbox_path.nil?
+        debug("Cleaning up local sandbox in #{sandbox_path}")
+        FileUtils.rmtree(sandbox_path)
+      end
 
-        def cleanup_sandbox
-          return if sandbox_path.nil?
-          debug("Cleaning up local sandbox in #{sandbox_path}")
-          FileUtils.rmtree(sandbox_path)
-        end
-        
-        def prepare_command
-          commands = []
-
-          if puppet_config
-            commands << [
-              sudo('cp'),
-              File.join(config[:root_path], 'puppet.conf'),
-              '/etc/puppet',
-            ].join(' ')
-          end
+      def prepare_command
+        commands = []
 
-          command = commands.join(' && ')
-          debug(command)
-          command
+        if puppet_config
+          commands << [
+            sudo('cp'),
+            File.join(config[:root_path], 'puppet.conf'),
+            '/etc/puppet'
+          ].join(' ')
         end
 
-        def run_command
-          if !config[:puppet_agent_command].nil?
-             return config[:puppet_agent_command]
-          else
-            [
-              custom_facts,
-              sudo('puppet'),
-              'agent',
-              puppet_server_flag,
-              "--waitforcert=#{config[:puppet_waitforcert]}",
-              puppet_masterport_flag,
-              puppet_certname_flag,
-              puppet_digest_flag,                
-              puppet_detailed_exitcodes_flag,
-              puppet_logdest_flag,
-              puppet_test_flag,
-              puppet_onetime_flag,
-              puppet_no_daemonize_flag,
-              puppet_noop_flag,
-              puppet_verbose_flag,
-              puppet_debug_flag
-            ].join(" ")
-          end
+        command = commands.join(' && ')
+        debug(command)
+        command
+      end
+
+      def run_command
+        if !config[:puppet_agent_command].nil?
+          return config[:puppet_agent_command]
+        else
+          [
+            custom_facts,
+            sudo('puppet'),
+            'agent',
+            puppet_server_flag,
+            "--waitforcert=#{config[:puppet_waitforcert]}",
+            puppet_masterport_flag,
+            puppet_certname_flag,
+            puppet_digest_flag,
+            puppet_detailed_exitcodes_flag,
+            puppet_logdest_flag,
+            puppet_test_flag,
+            puppet_onetime_flag,
+            puppet_no_daemonize_flag,
+            puppet_noop_flag,
+            puppet_verbose_flag,
+            puppet_debug_flag
+          ].join(' ')
         end
+      end
 
-        protected
+      protected
 
-        def load_needed_dependencies!
-        end
+      def load_needed_dependencies!
+      end
 
-        def puppet_config
-          config[:puppet_config_path]
-        end
-        
-        def puppet_debian_version
-          config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
-        end
+      def puppet_config
+        config[:puppet_config_path]
+      end
 
-        def puppet_redhat_version
-          config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
-        end
+      def puppet_debian_version
+        config[:puppet_version] ? "=#{config[:puppet_version]}" : nil
+      end
 
-        def puppet_noop_flag
-          config[:puppet_noop] ? '--noop' : nil
-        end
+      def puppet_redhat_version
+        config[:puppet_version] ? "-#{config[:puppet_version]}" : nil
+      end
 
-        def puppet_debug_flag
-          config[:puppet_debug] ? '-d' : nil
-        end
+      def puppet_noop_flag
+        config[:puppet_noop] ? '--noop' : nil
+      end
 
-        def puppet_verbose_flag
-          config[:puppet_verbose] ? '-v' : nil
-        end
+      def puppet_debug_flag
+        config[:puppet_debug] ? '-d' : nil
+      end
 
-        def puppet_platform
-          config[:puppet_platform].to_s.downcase
-        end
+      def puppet_verbose_flag
+        config[:puppet_verbose] ? '-v' : nil
+      end
 
-        def update_packages_debian_cmd
-          config[:update_package_repos] ? "#{sudo('apt-get')} update" : nil
-        end
+      def puppet_platform
+        config[:puppet_platform].to_s.downcase
+      end
 
-        def update_packages_redhat_cmd
-          config[:update_package_repos] ? "#{sudo('yum')} makecache" : nil
-        end
-        
-        def custom_facts
-          return nil if config[:custom_facts].none?
-          bash_vars = config[:custom_facts].map { |k,v| "FACTER_#{k}=#{v}" }.join(" ")
-          bash_vars = "export #{bash_vars};"
-          debug(bash_vars)
-          bash_vars
-        end
+      def update_packages_debian_cmd
+        config[:update_package_repos] ? "#{sudo('apt-get')} update" : nil
+      end
 
-        def puppet_server_flag
-	   config[:puppet_server] ? "--server=#{config[:puppet_server]}" : nil
-        end       
+      def update_packages_redhat_cmd
+        config[:update_package_repos] ? "#{sudo('yum')} makecache" : nil
+      end
 
-        def puppet_masterport_flag
-	   config[:puppet_masterport] ? '--masterport=#{config[:puppet_masterport]}' : nil
-        end      
+      def custom_facts
+        return nil if config[:custom_facts].none?
+        bash_vars = config[:custom_facts].map { |k, v| "FACTER_#{k}=#{v}" }.join(' ')
+        bash_vars = "export #{bash_vars};"
+        debug(bash_vars)
+        bash_vars
+      end
 
-        def puppet_detailed_exitcodes_flag
-	   config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
-        end      
+      def puppet_server_flag
+        config[:puppet_server] ? "--server=#{config[:puppet_server]}" : nil
+      end
 
-        def puppet_logdest_flag
-	   config[:puppet_logdest] ? "--logdest=#{config[:puppet_logdest]}" : nil
-        end      
+      def puppet_masterport_flag
+        config[:puppet_masterport] ? '--masterport=#{config[:puppet_masterport]}' : nil
+      end
 
-        def puppet_test_flag
-	   config[:puppet_test] ? '--test' : nil
-        end      
+      def puppet_detailed_exitcodes_flag
+        config[:puppet_detailed_exitcodes] ? '--detailed-exitcodes' : nil
+      end
 
-        def puppet_onetime_flag
-	   config[:puppet_onetime] ? '--onetime' : nil
-        end      
-        
-        def puppet_no_daemonize_flag
-	   config[:puppet_no_daemonize] ? '--no-daemonize' : nil
-        end
+      def puppet_logdest_flag
+        config[:puppet_logdest] ? "--logdest=#{config[:puppet_logdest]}" : nil
+      end
 
-        def puppet_no_daemonize
-          config[:puppet_no_daemonize]
-        end  
-        
-        def puppet_server
-          config[:puppet_server]
-        end  
-        
-        def puppet_certname_flag
-	   config[:puppet_certname] ? "--certname=#{config[:puppet_certname]}" : nil
-        end 
-        
-        def puppet_digest_flag
-	   config[:puppet_digest] ? "--digest=#{config[:puppet_digest]}" : nil
-        end 
-        
-        def puppet_apt_repo
-          config[:puppet_apt_repo]
-        end
+      def puppet_test_flag
+        config[:puppet_test] ? '--test' : nil
+      end
 
-        def puppet_apt_repo_file
-          config[:puppet_apt_repo].split('/').last
-        end
+      def puppet_onetime_flag
+        config[:puppet_onetime] ? '--onetime' : nil
+      end
 
-        def puppet_yum_repo
-          config[:puppet_yum_repo]
-        end
+      def puppet_no_daemonize_flag
+        config[:puppet_no_daemonize] ? '--no-daemonize' : nil
+      end
 
-        def chef_url
-          config[:chef_bootstrap_url]
-        end
+      def puppet_no_daemonize
+        config[:puppet_no_daemonize]
+      end
 
-        def prepare_puppet_config
-          return unless puppet_config
+      def puppet_server
+        config[:puppet_server]
+      end
 
-          info('Preparing puppet.conf')
-          debug("Using puppet config from #{puppet_config}")
+      def puppet_certname_flag
+        config[:puppet_certname] ? "--certname=#{config[:puppet_certname]}" : nil
+      end
 
-          FileUtils.cp_r(puppet_config, File.join(sandbox_path, 'puppet.conf'))
-        end
+      def puppet_digest_flag
+        config[:puppet_digest] ? "--digest=#{config[:puppet_digest]}" : nil
+      end
+
+      def puppet_apt_repo
+        config[:puppet_apt_repo]
+      end
+
+      def puppet_apt_repo_file
+        config[:puppet_apt_repo].split('/').last
+      end
+
+      def puppet_yum_repo
+        config[:puppet_yum_repo]
+      end
+
+      def chef_url
+        config[:chef_bootstrap_url]
+      end
+
+      def prepare_puppet_config
+        return unless puppet_config
+
+        info('Preparing puppet.conf')
+        debug("Using puppet config from #{puppet_config}")
+
+        FileUtils.cp_r(puppet_config, File.join(sandbox_path, 'puppet.conf'))
+      end
     end
   end
 end