gogetit 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61751267d26d38a3483ce27309262a216614f6a1
-  data.tar.gz: 4ca2a6149614790a782b225786f16f8707f87a86
+  metadata.gz: 0890aeef5f381b7a754be4830c3cb9e4ac68505a
+  data.tar.gz: 3d984331c7ea4ddd357544e6e82161167d054333
 SHA512:
-  metadata.gz: 39493d947b7aa4464abdbcf49770911662b349461a151a2c9584d1f768c929cf17f1c03818b5ba86ee0797265affe056680693f8a156f3b7474cc547ee1f59fa
-  data.tar.gz: b90078303ea89a51598197c789b9b6ba8ac8d87da3368c9e0df19abaf7ac5fd724a9461e59375b2b7ad1027acdf06a6ed07bd779115208317ea700ee7c53c6e0
+  metadata.gz: 066366221ebb84db77e72387836b0ae08221caa25d6c8698773e3bfe82c0038bdf4e2742dcb9fea2df65985bea01e3cb1938f913c2a8eb9acb34efb81e6e4fa9
+  data.tar.gz: f549b6db39ab79199e082ba7cef1b237cfaac796404cebf1029a7580363d1c8dd51cdb520d355b50a933f94d84f2ac2530f206dede2a0d490bbc2f8af59e1a2b

data/lib/gogetit/util.rb

@@ -8,12 +8,13 @@ require 'timeout'
 
 module Gogetit
   module Util
-    def run_command(cmd, logger)
+    def run_command(cmd)
       logger.info("Calling <#{__method__.to_s}> to run #{cmd}")
       system(cmd)
     end
 
     def is_port_open?(ip, port)
+      logger.info("Calling <#{__method__.to_s}> to check #{ip}:#{port}")
       begin
         Timeout::timeout(1) do
           begin
@@ -50,7 +51,7 @@ module Gogetit
       end
     end
 
-    def knife_bootstrap(name, provider, config, logger)
+    def knife_bootstrap(name, provider, config)
       logger.info("Calling <#{__method__.to_s}>")
       config[:chef][:target_environment] ||= '_default'
       if find_executable 'knife'
@@ -71,7 +72,7 @@ module Gogetit
       end
     end
 
-    def update_databags(config, logger)
+    def update_databags(config)
       logger.info("Calling <#{__method__.to_s}>")
       data_bags_dir = "#{config[:chef][:chef_repo_root]}/data_bags"
 
@@ -89,7 +90,7 @@ module Gogetit
           )
           case answer
           when 'y'
-            run_command("knife data bag delete -y #{bag}", logger)
+            run_command("knife data bag delete -y #{bag}")
           when 'n'
             puts 'Keeping..'
           end
@@ -98,7 +99,7 @@ module Gogetit
       puts 'Checking databags to create..'
       (databags_to_be - databags_as_is).each do |bag|
         puts "Creating databag '#{bag}'.."
-        run_command("knife data bag create #{bag}", logger)
+        run_command("knife data bag create #{bag}")
       end
 
       puts 'Checking items..'
@@ -113,28 +114,25 @@ module Gogetit
             if items_as_is.include? item
               run_command(
                 "knife vault update #{bag} #{item} --json #{item_file}"\
-                " --search '*:*' -M client",
-                logger
+                " --search '*:*' -M client"
               )
             else
               run_command(
                 "knife vault create #{bag} #{item} --json #{item_file}"\
-                " --search '*:*' -M client",
-                logger
+                " --search '*:*' -M client"
               )
             end
             run_command(
-              "knife vault refresh #{bag} #{item} --clean-unknown-clients -M client",
-              logger
+              "knife vault refresh #{bag} #{item} --clean-unknown-clients -M client"
             )
           else
-            run_command("knife data bag from file #{bag} #{item_file}", logger)
+            run_command("knife data bag from file #{bag} #{item_file}")
           end
         end
       end
     end
 
-    def knife_remove(name, logger)
+    def knife_remove(name)
       logger.info("Calling <#{__method__.to_s}>")
       if find_executable 'knife'
         if system('knife ssl check')
@@ -170,29 +168,29 @@ module Gogetit
       end
     end
 
-    def wait_until_available(ip_or_fqdn, distro_name, logger)
+    def wait_until_available(ip_or_fqdn, distro_name)
       logger.info("Calling <#{__method__.to_s}>")
-      until ping_available?(ip_or_fqdn, logger)
+      until ping_available?(ip_or_fqdn)
         logger.info("Calling <#{__method__.to_s}> for ping to be ready..")
         sleep 3
       end
       logger.info("#{ip_or_fqdn} is now available to ping..")
 
-      until ssh_available?(ip_or_fqdn, distro_name, logger)
+      until ssh_available?(ip_or_fqdn, distro_name)
         logger.info("Calling <#{__method__.to_s}> for ssh to be ready..")
         sleep 3
       end
       logger.info("#{ip_or_fqdn} is now available to ssh..")
     end
 
-    def ping_available?(host, logger)
+    def ping_available?(host)
       # host can be both IP and ip_or_fqdn.
       logger.info("Calling <#{__method__.to_s}> for #{host}")
       `ping -c 1 -W 1 #{host}`
       $?.exitstatus == 0
     end
 
-    def ssh_available?(ip_or_fqdn, user, logger)
+    def ssh_available?(ip_or_fqdn, user)
       logger.info("Calling <#{__method__.to_s}>")
       begin
         Net::SSH.start(ip_or_fqdn, user).class
@@ -201,11 +199,11 @@ module Gogetit
       end
     end
 
-    def check_ip_available(addresses, maas, logger)
+    def check_ip_available(addresses, maas)
       logger.info("Calling <#{__method__.to_s}>")
       # to do a ping test
       addresses.each do |ip|
-        abort("#{ip} is already being used.") if ping_available?(ip, logger)
+        abort("#{ip} is already being used.") if ping_available?(ip)
       end
       # to check with MAAS
       ifaces = maas.ip_reserved?(addresses)
@@ -214,7 +212,7 @@ module Gogetit
       return ifaces
     end
 
-    def run_through_ssh(host, distro_name, commands, logger)
+    def run_through_ssh(host, distro_name, commands)
       logger.info("Calling <#{__method__.to_s}>")
       Net::SSH.start(host, distro_name) do |ssh|
         commands.each do |cmd|

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

data/lib/providers/libvirt.rb

@@ -153,7 +153,7 @@ module Gogetit
       ifaces = nil
 
       if options['ipaddresses']
-        ifaces = check_ip_available(options['ipaddresses'], maas, logger)
+        ifaces = check_ip_available(options['ipaddresses'], maas)
         domain = generate_nics(ifaces, domain)
       elsif options['vlans']
         #check_vlan_available(options['vlans'])
@@ -197,7 +197,7 @@ module Gogetit
 
       fqdn = name + '.' + maas.get_domain
       distro_name = maas.get_distro_name(system_id)
-      wait_until_available(fqdn, distro_name, logger)
+      wait_until_available(fqdn, distro_name)
 
       # To enable serial console to use 'virsh console'
       if distro_name == 'ubuntu'
@@ -205,7 +205,7 @@ module Gogetit
           'sudo systemctl enable serial-getty@ttyS0.service',
           'sudo systemctl start serial-getty@ttyS0.service'
         ]
-        run_through_ssh(fqdn, distro_name, commands, logger)
+        run_through_ssh(fqdn, distro_name, commands)
       end
 
       logger.info("#{domain[:name]} has been created.")
@@ -283,7 +283,7 @@ module Gogetit
 
       fqdn = name + '.' + maas.get_domain
       distro_name = maas.get_distro_name(system_id)
-      wait_until_available(fqdn, distro_name, logger)
+      wait_until_available(fqdn, distro_name)
 
       # To enable serial console to use 'virsh console'
       if distro_name == 'ubuntu'
@@ -291,15 +291,17 @@ module Gogetit
           'sudo systemctl enable serial-getty@ttyS0.service',
           'sudo systemctl start serial-getty@ttyS0.service'
         ]
-        run_through_ssh(fqdn, distro_name, commands, logger)
+        run_through_ssh(fqdn, distro_name, commands)
       end
 
       logger.info("#{name} has been created.")
       puts "ssh #{distro_name}@#{name}"
 
-      distro[:default_user] = distro_name
+      info = {}
+      info[:distro] = distro
+      info[:default_user] = distro_name
 
-      { result: true, info: distro }
+      { result: true, info: info }
     end
 
     def release(name)

data/lib/providers/lxd.rb

@@ -171,7 +171,7 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
           YAML.dump(args[:config][:"user.network-config"])[4..-1]
 
       elsif options['ipaddresses']
-        options[:ifaces] = check_ip_available(options['ipaddresses'], maas, logger)
+        options[:ifaces] = check_ip_available(options['ipaddresses'], maas)
         abort("There is no dns server specified for the gateway network.") \
           unless options[:ifaces][0]['dns_servers'][0]
         abort("There is no gateway specified for the gateway network.") \
@@ -410,7 +410,7 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
 
       args[:default_user] = default_user
 
-      wait_until_available(ip_or_fqdn, default_user, logger)
+      wait_until_available(ip_or_fqdn, default_user)
       logger.info("#{name} has been created.")
 
       if options['no-maas']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Don Draper