From 2bc40d4b7212b4a10cc33e2ecf3b302213d8ce2c Mon Sep 17 00:00:00 2001
From: Pieter Vogelaar <pieter@pietervogelaar.nl>
Date: Wed, 22 Jun 2016 21:57:30 +0200
Subject: [PATCH] Execute custom_install_command as very first

The company I work for at the moment does SSL inception on the VPN connection. This way the installation of the puppet agent fails. If I copy the self signed CA pem file into the VM at "/etc/pki/ca-trust/source/anchors/vpn-ca.pem" and run "update-ca-trust", the SSL connection is valid and the puppet agent installation is successful. However, at the moment it's not possible to specify multiple Kitchen provisioners (https://github.com/test-kitchen/test-kitchen/issues/329). An alternative is to use the custom_install_command, but right now this command is executed AFTER the puppet agent installation step, so I can't use it unless it's executed earlier.

Is this a correct solution or do you have an alternative?
---
 lib/kitchen/provisioner/puppet_apply.rb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/kitchen/provisioner/puppet_apply.rb b/lib/kitchen/provisioner/puppet_apply.rb
index 1c286eb..bc9f8aa 100644
--- a/lib/kitchen/provisioner/puppet_apply.rb
+++ b/lib/kitchen/provisioner/puppet_apply.rb
@@ -184,7 +184,7 @@ def install_command
             info("Installing puppet on #{config[:platform]}")
             # need to add a CR to avoid trouble with proxy settings concatenation
             <<-INSTALL
-
+              #{custom_install_command}
               if [ ! $(which puppet) ]; then
                 #{sudo('apt-get')} -y install wget
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
@@ -198,26 +198,24 @@ def install_command
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
-              #{custom_install_command}
             INSTALL
           when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
             info("Installing puppet from yum on #{puppet_platform}")
             # need to add a CR to avoid trouble with proxy settings concatenation
             <<-INSTALL
-
+              #{custom_install_command}
               if [ ! $(which puppet) ]; then
                 #{install_puppet_yum_repo}
               fi
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
-              #{custom_install_command}
             INSTALL
           else
             info('Installing puppet, will try to determine platform os')
             # need to add a CR to avoid trouble with proxy settings concatenation
             <<-INSTALL
-
+              #{custom_install_command}
               if [ ! $(which puppet) ]; then
                 if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
                     #{install_puppet_yum_repo}
@@ -239,7 +237,6 @@ def install_command
               #{install_eyaml}
               #{install_deep_merge}
               #{install_busser}
-              #{custom_install_command}
             INSTALL
           end
         end
@@ -252,6 +249,7 @@ def install_command_collections
           info("Installing Puppet Collections on #{puppet_platform}")
           <<-INSTALL
           #{Util.shell_helpers}
+          #{custom_install_command}
           if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
             if [ ! -f "#{config[:puppet_apt_collections_repo]}" ]; then
               #{sudo('apt-get')} -y install wget
@@ -264,12 +262,12 @@ def install_command_collections
           #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
           #{install_deep_merge}
           #{install_busser}
-          #{custom_install_command}
           INSTALL
         when 'redhat', 'centos', 'fedora', 'oracle', 'amazon'
           info("Installing Puppet Collections on #{puppet_platform}")
           <<-INSTALL
           #{Util.shell_helpers}
+          #{custom_install_command}
           if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
             echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
             #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
@@ -278,12 +276,12 @@ def install_command_collections
           #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
           #{install_deep_merge}
           #{install_busser}
-          #{custom_install_command}
           INSTALL
         else
           info('Installing Puppet Collections, will try to determine platform os')
           <<-INSTALL
             #{Util.shell_helpers}
+            #{custom_install_command}
             if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ] || \
                  [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
@@ -301,7 +299,6 @@ def install_command_collections
             #{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
             #{install_deep_merge}
             #{install_busser}
-            #{custom_install_command}
           INSTALL
         end
       end