mofa 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b253d74784ec5ffc5b796f2387a69f55bbc448e4
-  data.tar.gz: dfcc89442b03ae56137d1474348c28b1ef5b9c96
+  metadata.gz: 5efe371265582362dd1c4fe8dd07eda8edb0f30d
+  data.tar.gz: 54b293d5773089c5af94a3fb583f834dabf76882
 SHA512:
-  metadata.gz: 05b0a881191afd9f165bb373ae85f1378aeec54e1224b9142892f7815b58924d3168b9e4f27e38feeff30f287d77e2550695a2194c76f5188b64d6234d8c195d
-  data.tar.gz: 12e2852d42432b68fbae89a09d45bd47a743b0761ce0e3afaac4cbe70d1d57bdac3bd51f0c40bbde324f7f88d061168beae7abb651218396f78292c5261bfad1
+  metadata.gz: c23a3c1066f0e4265ed3150bf57b556c8876dfe3d53aab4391c5bcd6c37a51437ec48530c6e3ba808725d61ba179a290c1b851d3888c65c3527777ce6eec8a3f
+  data.tar.gz: 22481687e449b1c8d25c4f2180c7dd7c91bcda22a147f80fe3626b497dd6198525ed830d86528319f2b8e97773e07a1f8c9e688fcd92d8ca7214e60e0d7a4df2

data/lib/mofa/cli.rb

@@ -19,6 +19,7 @@ module Mofa
     method_option :ignore_ping, :type => :boolean, :aliases => '-p'
     method_option :target, :type => :string, :aliases => '-t'
     method_option :concrete_target, :type => :string, :aliases => '-T'
+    method_option :sshport, :type => :string, :aliases => '-P'
     method_option :runlist, :type => :string, :aliases => '-o'
     method_option :attributes, :type => :string, :aliases => '-j'
     method_option :service_hostlist_url, :type => :string
@@ -47,7 +48,7 @@ module Mofa
       cmd.options = options
 
       cmd.prepare
-      cmd.execute
+      cmd.execute(options[:sshport])
       cmd.cleanup
     end
 

data/lib/mofa/mofa_cmd.rb

@@ -21,7 +21,7 @@ class MofaCmd
   end
 
   # @abstract
-  def execute
+  def execute(_sshport)
     raise RuntimeError, "must be implemented"
   end
 

data/lib/mofa/provision_cmd.rb

@@ -14,7 +14,7 @@ class ProvisionCmd < MofaCmd
     cookbook.prepare
   end
 
-  def execute
+  def execute(sshport = 22)
     cookbook.execute
 
     hostlist.retrieve
@@ -30,7 +30,7 @@ class ProvisionCmd < MofaCmd
 
     puts "Hostlist after runlist filtering: #{hostlist.list.inspect}"
 
-    exit_code = run_chef_solo_on_hosts
+    exit_code = run_chef_solo_on_hosts(sshport)
 
     exit_code
   end
@@ -121,13 +121,13 @@ class ProvisionCmd < MofaCmd
     end
   end
 
-  def run_chef_solo_on_hosts
+  def run_chef_solo_on_hosts(sshport = Mofa::Config.config['ssh_port'])
     time = Time.new
     # Create a temp working dir on the target host
     solo_dir = '/var/tmp/' + time.strftime('%Y-%m-%d_%H%M%S')
     puts
     puts 'Chef-Solo Run started at ' + time.strftime('%Y-%m-%d %H:%M:%S')
-    puts "Will use ssh_user #{Mofa::Config.config['ssh_user']}, ssh_port #{Mofa::Config.config['ssh_port']} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
+    puts "Will use ssh_user #{Mofa::Config.config['ssh_user']}, ssh_port #{sshport} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
     at_least_one_chef_solo_run_failed = false
     chef_solo_runs = {}
     host_index = 0
@@ -146,7 +146,7 @@ class ProvisionCmd < MofaCmd
 
       prepare_host(hostname, host_index, solo_dir)
 
-      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |sftp|
+      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |sftp|
         # remotely creating solo.rb
         create_solo_rb(sftp, hostname, solo_dir)
 
@@ -164,7 +164,7 @@ class ProvisionCmd < MofaCmd
           # Do it -> Execute the chef-solo run!
           begin
             begin
-              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |ssh|
                 puts "Remotely unpacking Cookbook Package #{cookbook.pkg_name}... "
                 ssh.exec!("cd #{solo_dir}; tar xvfz #{cookbook.pkg_name}") do |_ch, _stream, line|
                   puts line if Mofa::CLI.option_debug
@@ -181,7 +181,7 @@ class ProvisionCmd < MofaCmd
               raise e
             end
             begin
-              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |ssh|
                 puts "Remotely running chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json"
                 chef_run_exit_code = 0
                 ssh.exec!("sudo chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json") do |_ch, _stream, line|
@@ -207,7 +207,7 @@ class ProvisionCmd < MofaCmd
             log_file.write('chef-solo run: FAIL')
             puts "ERRORS detected while provisioning #{hostname} (#{e.message})."
           end
-          Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+          Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |ssh|
             snapshot_or_release = cookbook.is_a?(SourceCookbook) ? 'snapshot' : 'release'
             out = ssh_exec!(ssh, "sudo chown -R #{Mofa::Config.config['ssh_user']}.#{Mofa::Config.config['ssh_user']} #{solo_dir}")
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0

data/lib/mofa/released_cookbook.rb

@@ -30,7 +30,7 @@ class ReleasedCookbook < Cookbook
     set_cookbooks_url
   end
 
-  def execute#
+  def execute
     package
   end
 

data/lib/mofa/upload_cmd.rb

@@ -15,7 +15,7 @@ class UploadCmd < MofaCmd
     cookbook.prepare
   end
 
-  def execute
+  def execute(_sshport)
     cookbook.execute
     upload_cookbook_pkg
   end

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Alexander Birk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec