bosh_cli 1.3058.0 → 1.3062.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e29841a01e7863c1bc7fbd7d7f6facafa5f5a2
-  data.tar.gz: 76b9871a63b6f7e6ebc398e128da498ed6351eb8
+  metadata.gz: 779da24861d181c978ca8b16f3f7bfa65cccf7d4
+  data.tar.gz: 1de415f4a2aeb597440adda4fb880aa7f2ff5588
 SHA512:
-  metadata.gz: e98677e4af68cfbfb0e29b34d77bcce6e8947a54af51cebe6149d9df24a867c95d52a9b23e2fb50b1cdc89f28e298224830a2beba2a111d900a222a6627b32e3
-  data.tar.gz: bddb4b2552fbc28bcff0dd50a87d841a1dde8ae06279d1365e4b7438ddd9c63d4b8e8556bb573d99268236be89927a60f709bc081abcbcdea02801a78005b759
+  metadata.gz: 7b925992ecb46f46a2fc989fe0a60de1b8d8cf6a698497c30ac6e3a0417c31ec936549b13f1f2d3d1061230b61da8982b79cc90d58aeab196d1db25731ff9a45
+  data.tar.gz: 74b25b52ead27fe0ce628b0cb463fcb48c37293c5b4a42e300d6b8719b81ab6982494048c33ee85fcf22b4eedcdb91e0262f90e4e19806fc6da8b04e9da93597

data/lib/cli/commands/instances.rb

@@ -44,10 +44,16 @@ module Bosh::Cli::Command
         s
       end
 
+      has_disk_cid = instances[0].has_key?('disk_cid')
+
       instances_table = table do |t|
         headings = ['Instance', 'State', 'Resource Pool', 'IPs']
         if options[:details]
-          headings += ['CID', 'Agent ID', 'Resurrection']
+          if has_disk_cid
+            headings += ['VM CID', 'Disk CID', 'Agent ID', 'Resurrection']
+          else
+            headings += ['VM CID', 'Agent ID', 'Resurrection']
+          end
         end
         if options[:dns]
           headings += ['DNS A records']
@@ -69,7 +75,11 @@ module Bosh::Cli::Command
           row = [job, instance['job_state'], instance['resource_pool'], ips]
 
           if options[:details]
-            row += [instance['vm_cid'], instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
+            if has_disk_cid
+              row += [instance['vm_cid'], instance['disk_cid'] || 'n/a', instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
+            else
+              row += [instance['vm_cid'], instance['agent_id'], instance['resurrection_paused'] ? 'paused' : 'active']
+            end
           end
 
           if options[:dns]

data/lib/cli/commands/ssh.rb

@@ -16,6 +16,8 @@ module Bosh::Cli
       option '--gateway_identity_file FILE', 'Gateway identity file'
       option '--default_password PASSWORD',
              'Use default ssh password (NOT RECOMMENDED)'
+      option '--strict_host_key_checking <yes/no>',
+             'Can use this flag to skip host key checking (NOT RECOMMENDED)'
 
       def shell(*args)
         if args.size > 0
@@ -187,20 +189,23 @@ module Bosh::Cli
 
           say("Starting interactive shell on job #{job}/#{index}")
 
+          skip_strict_host_key_checking = options[:strict_host_key_checking] =~ (/(no|false)$/i) ?
+              '-o StrictHostKeyChecking=no' : '-o StrictHostKeyChecking=yes'
+
           if gateway
             port        = gateway.open(session['ip'], 22)
-            ssh_session = Process.spawn('ssh', "#{user}@localhost", '-p', port.to_s)
+            ssh_session = Process.spawn('ssh', "#{user}@localhost", '-p', port.to_s, skip_strict_host_key_checking)
             Process.waitpid(ssh_session)
             gateway.close(port)
           else
-            ssh_session = Process.spawn('ssh', "#{user}@#{session['ip']}")
+            ssh_session = Process.spawn('ssh', "#{user}@#{session['ip']}", skip_strict_host_key_checking)
             Process.waitpid(ssh_session)
           end
         end
       end
 
       def perform_operation(operation, deployment_name, job, index, args)
-        setup_ssh(deployment_name, job, index, nil) do |sessions, user, gateway|
+        setup_ssh(deployment_name, job, index, options[:default_password]) do |sessions, user, gateway|
           sessions.each do |session|
             unless session['status'] == 'success' && session['ip']
               err("Failed to set up SSH on #{job}/#{index}: #{session.inspect}")

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3058.0'
+    VERSION = '1.3062.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3058.0
+  version: 1.3062.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3058.0
+        version: 1.3062.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  7510f3
+  704861
 email: support@cloudfoundry.com
 executables:
 - bosh