Merge pull request #185 from MikaelSmith/fix-no-ssh-key

(bug) Fix abs checkout when 'ABS_SSH_PRIVATE_KEY' is unset
puppetlabs · Dec 14, 2021 · 183fefe · 183fefe
2 parents 0276ddf + 70ce5ac
commit 183fefe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tasks/abs.rb b/tasks/abs.rb
@@ -77,7 +77,7 @@ def provision(platform, inventory_location, vars)
       node = { 'uri' => host['hostname'],
                'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => ENV['ABS_USER'], 'host-key-check' => false } },
                'facts' => { 'provisioner' => 'abs', 'platform' => host['type'], 'job_id' => job_id } }
-      if !ENV['ABS_SSH_PRIVATE_KEY'].empty?
+      if !ENV['ABS_SSH_PRIVATE_KEY'].nil? && !ENV['ABS_SSH_PRIVATE_KEY'].empty?
         node['config']['ssh']['private-key'] = ENV['ABS_SSH_PRIVATE_KEY']
       else
         node['config']['ssh']['password'] = ENV['ABS_PASSWORD']