danarchy_sys 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91467380d7fc7465187c4929c8421828cb7d1343
-  data.tar.gz: c97f5d4a0b6ad94e05a2e7758b8f525f8184d2ee
+  metadata.gz: e3f76e6fb34f0feb1d9f1cf3d322682a57d7d750
+  data.tar.gz: 9ddddfb4bc3c9736987becf0a56e1f866ecc85a6
 SHA512:
-  metadata.gz: 09f9b084eba3b008aacd25310afe55d2a298ac8113649bd1224689be72418cfc5bc79674fd8f3685dc85f8e76d916cdc4d85073324e102744f4ecf1702adbada
-  data.tar.gz: be506fe3640af9e886ccc951bc8067dbb0f89b858ebaaa1bdbce4a0ee85b7c27c0ef222a575835c06c88dc8c6b242bf4c3f703704c23ccd512042aeca99ccfd2
+  metadata.gz: 75cd4dbcac1d2079567ba80ebb59a22de3c9c4931440b55202c19f1165f6e2945ebae9387e9a968601a134ae50e72b676d9b3aae2429da530dd4d03040dbb024
+  data.tar.gz: d28bd7ea89a6352b892ba4e86650aae633b81551dd5c3c039fc8156f50476c298bf7be6614273555a306f2cc8843b55f7d308a601aee842eed2590d0e6757e8d

data/lib/danarchy_sys/cli/instance_manager/prompts_create_instance.rb

@@ -89,7 +89,6 @@ class PromptsCreateInstance
 
     flavor_name = item_chooser(flavors_numbered, 'flavor')
     print "Flavor Name: #{flavor_name.split('.')[1]}\n"
-    p comp_flvs.methods
     comp_flvs.get_flavor_by_name(flavor_name)
   end
 

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -142,7 +142,7 @@ Should we create a new instance named #{instance_name}? (Y/N): "
           return instance
         else
           puts "Not creating new instance: #{instance_name}."
-          return
+          return false
         end
       end
     end

data/lib/danarchy_sys/openstack/compute.rb

@@ -50,50 +50,48 @@ module DanarchySys
         image_id = instance.image['id']
         image = comp_img.get_image_by_id(image_id)
 
-        ssh = nil
+        ssh, user = nil
         if image == nil
           puts "Image not found for #{instance.name}! This instance needs to be rebuild with a current image."
-          ssh = fallback_ssh(ipv4, pemfile)
+          ssh, user = fallback_ssh(ipv4, pemfile)
+        else
+          user = 'ubuntu' if image.name =~ /ubuntu/i
+          user = 'debian' if image.name =~ /debian/i
+          user = 'centos' if image.name =~ /centos/i
+          user = 'fedora' if image.name =~ /fedora/i
+          user = 'core'   if image.name =~ /coreos/i
         end
 
-        return ssh if ssh == true
+        return if !user
 
-        # CoreOS is an exception with user as simply 'core' and not 'coreos'
-        user = 'ubuntu' if image.name =~ /ubuntu/i
-        user = 'debian' if image.name =~ /debian/i
-        user = 'centos' if image.name =~ /centos/i
-        user = 'fedora' if image.name =~ /fedora/i
-        user = 'core'   if image.name =~ /coreos/i
-
-        puts "Connecting as user: #{user} => #{ipv4}"
-        connect = "ssh #{user}@#{ipv4} -i '#{pemfile}'"
-        ssh = system(connect)
-
-        attempts = 1
-        until ssh == true || attempts > 3
-          puts "Connection failed. Attempting again after 5 seconds..."
-          sleep(5)
-          fallback_ssh(ipv4, pemfile)
-          attempts += 1
-          puts 'Giving up after 3 tries.' if attempts > 3
-        end
-
-        ssh
+        puts "Connecting as user: #{user} @ #{ipv4}"
+        connect = "/usr/bin/ssh -i '#{pemfile}' #{user}@#{ipv4}"
+        system(connect)
       end
 
       def fallback_ssh(ipv4, pemfile)
-        users = ['ubuntu','debian','centos','fedora','core']
-        ssh = nil
-
-        users.each do |user|
-          puts "Attempting connection as user: #{user} => #{ipv4}"
-          connect = "ssh #{user}@#{ipv4} -i '#{pemfile}'"
-          ssh = system(connect)
-          break if ssh == true
+        users = %w[centos ubuntu debian fedora core]
+        ssh, user = nil
+
+        users.each do |username|
+          print "Attempting connection as user: #{username} @ #{ipv4} => "
+          connect = "/usr/bin/ssh -i '#{pemfile}' #{username}@#{ipv4}"
+          ssh = system("#{connect} 'uptime' &>/dev/null")
+          puts 'failed' if ssh ==false
+
+          if ssh == true
+            puts 'success'
+            user = username
+            break
+          end
         end
 
-        puts 'Unable to connect! User unknown or SSHd is not running on the instance.' if ssh == false
-        ssh
+        if ssh == false
+          puts 'Unable to connect! User unknown or SSHd is not running on the instance.' 
+          return ssh, nil
+        else
+          return [ssh, user]
+        end
       end
     end
   end

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack