gogetit 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe1aadb7778ccd6b7a4dcf5fadba904e63b27dc
-  data.tar.gz: 062af3dd9a89457c06a2a6f9996b9a9bcde2c898
+  metadata.gz: 01a616e34651706a336ec6a266e45b0ea5facbb1
+  data.tar.gz: 7a49f258a50d7b4d5f678daa02c9e67a9e5f19a9
 SHA512:
-  metadata.gz: 6ba7a634d943732ca6f4a7a0be8a7834bc79a4ebbab919548789f6870b27c039130dee6f04061dfaefdd4026fa28182e35b11cbcee9abc1bc26c037113f816d8
-  data.tar.gz: 9c1e82982b6bc8f54dbed794c567c3687f24eae269e4ba9ca8bfadcae102bb2b395863222b4654208cb510410e798d4b90a5d60c196bfccb9e7de9404e8d6c4a
+  metadata.gz: ad0e68eaf277c1b05fb6fd1b9b0634f32b79bd30eee220db2b9ec4bfc3f9bfde500e6b326bf59c92d35055b07529846e6d243880a4c83643240ee1e21c3ccb23
+  data.tar.gz: fe1334ef49fe38c0b5cbb9a1095176a75d8735a48c8c0c16cec008380086cd04af9f4c39046036a7ce896f4de6f8d75aab286f09fc03a2f92bc737f0a179aef0

data/README.md

@@ -56,6 +56,13 @@ gogetit create lxd01 -p lxd -i 192.168.10.10 10.0.0.2
 gogetit create kvm01 -p libvirt
 gogetit create kvm01 -p libvirt -i 192.168.10.10 10.0.0.2
 
+# When specifying alias for LXD provider
+gogetit create kvm01 -a centos7
+gogetit create kvm01 -p lxd -a centos7
+
+# When specifying distro for Libvirt provider
+gogetit create kvm01 -p libvirt -d centos
+
 # to create a LXD container without MAAS awareness
 gogetit create lxd01 --no-maas -f lxd_without_maas.yml
 gogetit create lxd01 --no-maas -f lxd_without_maas_vlans.yml
@@ -78,6 +85,9 @@ CHEF=true gogetit create chef01
 
 # to destroy a container deleting corresponding chef node and client
 gogetit destroy chef01 --chef
+
+# to release a machine(or instance created by libvirt) in MAAS
+gogetit release node01
 ```
 
 ```ruby

data/lib/gogetit/cli.rb

@@ -20,7 +20,9 @@ module Gogetit
     method_option :provider, :aliases => '-p', :type => :string, \
       :default => 'lxd', :desc => 'A provider such as lxd and libvirt'
     method_option :alias, :aliases => '-a', :type => :string, \
-      :default => '', :desc => 'An alias name for a lxd image'
+      :desc => 'An alias name for a lxd image'
+    method_option :distro, :aliases => '-d', :type => :string, \
+      :desc => 'A distro name with its series for libvirt provider'
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
     method_option :vlans, :aliases => '-v', :type => :array, \
@@ -41,6 +43,12 @@ module Gogetit
       abort("'no-maas' and 'file' have to be set together.") \
         if options['no-maas'] ^ !!options['file']
 
+      abort("'distro' has to be set with libvirt provider.") \
+        if options['distro'] and options['provider'] == 'lxd'
+
+      abort("'alias' has to be set with lxd provider.") \
+        if options['alias'] and options['provider'] == 'libvirt'
+
       case options['provider']
       when 'lxd'
         Gogetit.lxd.create(name, options.to_hash)
@@ -57,7 +65,7 @@ module Gogetit
       end
     end
 
-    desc 'destroy NAME', 'Destroy either a container or KVM domain.'
+    desc 'destroy NAME', 'Destroy either a container or KVM instance.'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
     def destroy(name)
       # Let Gogetit recognize the provider.
@@ -79,6 +87,28 @@ module Gogetit
       end
     end
 
+    desc 'release NAME', 'Release a node in MAAS'
+    method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
+    def release(name)
+      # Let Gogetit recognize the provider.
+      provider = Gogetit.get_provider_of(name)
+      if provider
+        case provider
+        when 'lxd'
+          abort('This method is not available for LXD container.')
+        when 'libvirt'
+          Gogetit.libvirt.release(name)
+        else
+          abort('Invalid argument entered.')
+        end
+      end
+      # post-tasks
+      if options['chef']
+        knife_remove(name, Gogetit.logger) if options[:chef]
+        update_databags(Gogetit.config, Gogetit.logger)
+      end
+    end
+
     # This feature is broken and might be deprecated in the future.
     # desc 'rebuild NAME', 'Destroy and create either a container or KVM domain again.'
     # def rebuild(type=nil, name)

data/lib/gogetit/maas.rb

@@ -28,6 +28,14 @@ module Gogetit
       false
     end
 
+    def get_distro_name(system_id)
+      logger.info("Calling <#{__method__.to_s}>")
+      conn.request(:get, ['machines']).each do |m|
+        return m['osystem'] if m['system_id'] == system_id
+      end
+      false
+    end
+
     def dnsresource_exists?(name)
       logger.info("Calling <#{__method__.to_s}>")
       conn.request(:get, ['dnsresources']).each do |item|
@@ -201,6 +209,7 @@ module Gogetit
       until conn.request(:get, ['machines', system_id])['status_name'] == state
         sleep 3
       end
+      logger.info("The status has become '#{state}'.")
     end
 
     def get_machine_state(system_id)

data/lib/gogetit/util.rb

@@ -141,7 +141,7 @@ module Gogetit
 		  end
 		end
 
-    def wait_until_available(ip_or_fqdn, logger)
+    def wait_until_available(ip_or_fqdn, distro_name, logger)
       logger.info("Calling <#{__method__.to_s}>")
       until ping_available?(ip_or_fqdn, logger)
         logger.info("Calling <#{__method__.to_s}> for ping to be ready..")
@@ -149,7 +149,7 @@ module Gogetit
       end
       logger.info("#{ip_or_fqdn} is now available to ping..")
 
-      until ssh_available?(ip_or_fqdn, 'ubuntu', logger)
+      until ssh_available?(ip_or_fqdn, distro_name, logger)
         logger.info("Calling <#{__method__.to_s}> for ssh to be ready..")
         sleep 3
       end
@@ -185,9 +185,9 @@ module Gogetit
       return ifaces
     end
 
-    def run_through_ssh(host, commands, logger)
+    def run_through_ssh(host, distro_name, commands, logger)
       logger.info("Calling <#{__method__.to_s}>")
-      Net::SSH.start(host, 'ubuntu') do |ssh|
+      Net::SSH.start(host, distro_name) do |ssh|
         commands.each do |cmd|
           logger.info("'#{cmd}' is being executed..")
           output = ssh.exec!(cmd)

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/providers/libvirt.rb

@@ -95,8 +95,8 @@ module Gogetit
       if options['ipaddresses']
         ifaces = check_ip_available(options['ipaddresses'], maas, logger)
         domain = generate_nics(ifaces, domain)
-      elsif options[:vlans]
-        #check_vlan_available(options[:vlans])
+      elsif options['vlans']
+        #check_vlan_available(options['vlans'])
       else
         domain[:nic] = [
           {
@@ -167,26 +167,39 @@ module Gogetit
 
         end
 
-      elsif options[:vlans]
-        #check_vlan_available(options[:vlans])
+      elsif options['vlans']
+        #check_vlan_available(options['vlans'])
       else
       end
 
       logger.info("Calling to deploy...")
-      maas.conn.request(:post, ['machines', system_id], {'op' => 'deploy'})
+
+      distro = nil
+      if options['distro'].nil? or options['distro'].empty?
+        distro = 'xenial'
+      else
+        distro = options['distro']
+      end
+
+      maas.conn.request(:post, ['machines', system_id], \
+                        {'op' => 'deploy', 'distro_series' => distro})
       maas.wait_until_state(system_id, 'Deployed')
 
       fqdn = name + '.' + maas.get_domain
-      wait_until_available(fqdn, logger)
+      distro_name = maas.get_distro_name(system_id)
+      wait_until_available(fqdn, distro_name, logger)
 
       # To enable serial console to use 'virsh console'
-      commands = [
-        'sudo systemctl enable serial-getty@ttyS0.service',
-        'sudo systemctl start serial-getty@ttyS0.service'
-      ]
-      run_through_ssh(fqdn, commands, logger)
+      if distro_name == 'ubuntu'
+        commands = [
+          'sudo systemctl enable serial-getty@ttyS0.service',
+          'sudo systemctl start serial-getty@ttyS0.service'
+        ]
+        run_through_ssh(fqdn, commands, distro_name, logger)
+      end
 
       logger.info("#{domain[:name]} has been created.")
+      puts "ssh #{distro_name}@#{name}"
       true
     end
 
@@ -225,6 +238,22 @@ module Gogetit
       true
     end
 
+    def release(name)
+      logger.info("Calling <#{__method__.to_s}>")
+      system_id = maas.get_system_id(name)
+      if maas.machine_exists?(name)
+        if maas.get_machine_state(system_id) == 'Deployed'
+          logger.info("Calling to release...")
+          maas.conn.request(:post, ['machines', system_id], {'op' => 'release'})
+          maas.wait_until_state(system_id, 'Ready')
+        end
+      end
+
+      maas.refresh_pods
+      logger.info("#{name} has been released.")
+      true
+    end
+
     def define_domain(domain)
       logger.info("Calling <#{__method__.to_s}>")
       template = File.read(config[:lib_dir] + '/template/domain.xml')

data/lib/providers/lxd.rb

@@ -318,9 +318,6 @@ module Gogetit
         ip_or_fqdn = name + '.' + maas.get_domain
       end
 
-      wait_until_available(ip_or_fqdn, logger)
-      logger.info("#{name} has been created.")
-
       if conn.execute_command(name, "ls /etc/lsb-release")[:metadata][:return] == 0
         default_user = 'ubuntu'
       elsif conn.execute_command(name, "ls /etc/redhat-release")[:metadata][:return] == 0
@@ -329,6 +326,9 @@ module Gogetit
         default_user = config[:default][:user]
       end
 
+      wait_until_available(ip_or_fqdn, default_user, logger)
+      logger.info("#{name} has been created.")
+
       if options['no-maas']
         puts "ssh #{default_user}@#{options['ip_to_access']}"
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler