beaker-task_helper 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5e1f77202c02443ad7f4dae1bdee8f41426c71d
-  data.tar.gz: 6860f600dad781f5c5ecf22eb40d6e2752645bcc
+  metadata.gz: f6d8f14889f34d8454b6b7c3edacb8ccd5fef898
+  data.tar.gz: c5cb9326641991c2ba2c7802aa9d8e8275f0de37
 SHA512:
-  metadata.gz: 49827637f04073ab7b64dd142db921e5d613d473338ab158ce416aa05d1e648ac66741163d4fba5f1b55f60c9dfe901324801b46e9fba76df60cee26faefd50c
-  data.tar.gz: 7b80cd400d1b07e0790636c2d1587358a642b386bcbd29138152f8a2c905375205b986f105fba27792832916f9fe933f29e8923d711f2d6bd19ea83742baba5d
+  metadata.gz: 6e5001028885a733480e6b98b2afcccc5bea4dfec1aedd8415bc71642583f16f2ea5c0286cd1617e6486e9d619a780658f03d390da73149cee389aaed2681a56
+  data.tar.gz: 58af4abbbf3eab20be6c31e43b96cefec8da0d67c14876490c689f1fee7705aebdb52253cfdd46df1c936ec5dd4f232f0a4acc67df740195af13bcac151f72de

data/lib/beaker-task_helper.rb

@@ -74,13 +74,24 @@ INSTALL_BOLT_PP
   #
   #TODO: Implement on windows
   def setup_ssh_access(task_runner, nodes)
-    ssh_dir_path = '/root/.ssh/'
-    rsa_pub_path = "#{ssh_dir_path}/id_rsa.pub"
-
-    on task_runner, "ssh-keygen -f #{ssh_dir_path}/id_rsa -t rsa -N ''"
-    public_key = on(task_runner, "cat #{rsa_pub_path}").stdout
-    create_remote_file(nodes, "#{rsa_pub_path}", public_key)
-    on(nodes, "cat #{rsa_pub_path} >> #{ssh_dir_path}/authorized_keys")
+    task_runner_ssh_dir = '/root/.ssh'
+    task_runner_rsa_pub = "#{task_runner_ssh_dir}/id_rsa.pub"
+    on task_runner, "ssh-keygen -f #{task_runner_ssh_dir}/id_rsa -t rsa -N ''"
+    public_key = on(task_runner, "cat #{task_runner_rsa_pub}").stdout
+
+    nodes.each do |node|
+        case node.platform
+        when /solaris-10/
+            ssh_dir_path = '/.ssh/'
+        when /osx-1012/
+            ssh_dir_path = '/var/root/.ssh/'
+        else
+            ssh_dir_path = '/root/.ssh'
+        end
+        rsa_pub_path = "#{ssh_dir_path}/id_rsa.pub"
+        create_remote_file(node, "#{rsa_pub_path}", public_key)
+        on(node, "cat #{rsa_pub_path} >> #{ssh_dir_path}/authorized_keys")
+    end
   end
 
   def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD, host: nil, format: 'human')

data/lib/beaker-task_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module TaskHelper
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.7.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-task_helper
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop