gogetit 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2893781eb0a3fc67d8515b13aaaab0f25fb9f0f6
-  data.tar.gz: e2d9bcbfdbb819011e07c3c3143b187743fb4711
+  metadata.gz: 90850298a6e02e953b7f0ebb6ed8e7cd7a4d47bd
+  data.tar.gz: 2f5fca754895bcf3f5342b952c08b81a7819d64f
 SHA512:
-  metadata.gz: 3be3cc5ecabcf20b5ea652b2d58e8afdf96afb5c63c2ad76746da7e286b91d5f55f0b073583c7655124f5c2ccbdd07e53434980cd8938785df824e4fb7f8bb6f
-  data.tar.gz: f35c97aa197aeb6e7afe4e36f61017511fc4e90b4bf3369d12ce61dd7a8fe8c8b2449819d3a24c1ced7179e6162610358f947920a786b131d2566b9e7c0e311f
+  metadata.gz: ee71a4680053f4b696bdebeceb9e366a97484f0ba1a2f2ea1a64aa3d121e24e9364a2536fb6c9848990ab5c097d29af5edb451b9677391669b57221dcd01ec14
+  data.tar.gz: 83b2a138facc3e1b9616a737f7277baf204a6b763ff329a91f9aa23f7372657f1fcddd3923250968e49cce66cec8f3a13a59cbdecc50d4d4f13d0f55b8f6ded4

data/README.md

@@ -97,13 +97,6 @@ gogetit release node01
 ```ruby
 require 'gogetit'
 ```
-## To make Gogetit recognize data bag that needs to be encrypted by Vault
-- Fill this out!
-
-## To develop
-- Deploying bare metal machine from machine pool
-- Static IP auto-assignment with VLAN info
-- Working with Multiple LXD and Libvirt hosts
 
 ## To document
 - How to make Gogetit recognize vault data bag items
@@ -117,6 +110,9 @@ Clone and then execute followings:
 
 Questions, pull requests, advices and suggestions are always welcome!
 
+## rubygems
+[https://rubygems.org/gems/gogetit](https://rubygems.org/gems/gogetit)
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/gogetit/cli.rb

@@ -3,10 +3,28 @@ require 'gogetit'
 require 'gogetit/util'
 
 module Gogetit
+
+  @@result = nil
+
+  def self.set_result(x)
+    @@result = x
+  end
+
+  def self.get_result
+    @@result
+  end
+
   class CLI < Thor
     include Gogetit::Util
     package_name 'Gogetit'
 
+    # attr_accessor :result
+
+    # def initialize(*args)
+    #   super
+    #   @result = nil
+    # end
+
     desc 'list', 'List containers and instances, running currently.'
     def list
       puts "Listing LXD containers on #{Gogetit.config[:lxd][:nodes][0][:url]}.."
@@ -51,9 +69,11 @@ module Gogetit
 
       case options['provider']
       when 'lxd'
-        Gogetit.lxd.create(name, options.to_hash)
+        result = Gogetit.lxd.create(name, options.to_hash)
+        Gogetit.set_result(result)
       when 'libvirt'
-        Gogetit.libvirt.create(name, options.to_hash)
+        result = Gogetit.libvirt.create(name, options.to_hash)
+        Gogetit.set_result(result)
       else
         abort('Invalid argument entered.')
       end
@@ -73,9 +93,11 @@ module Gogetit
       if provider
         case provider
         when 'lxd'
-          Gogetit.lxd.destroy(name)
+          result = Gogetit.lxd.destroy(name)
+          Gogetit.set_result(result)
         when 'libvirt'
-          Gogetit.libvirt.destroy(name)
+          result = Gogetit.libvirt.destroy(name)
+          Gogetit.set_result(result)
         else
           abort('Invalid argument entered.')
         end
@@ -93,7 +115,7 @@ module Gogetit
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
     def deploy(name)
-      Gogetit.libvirt.deploy(name, options.to_hash)
+      Gogetit.set_result(Gogetit.libvirt.deploy(name, options.to_hash))
 
       # post-tasks
       if options['chef']
@@ -105,14 +127,35 @@ module Gogetit
     desc 'release NAME', 'Release a node in MAAS'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
     def release(name)
+      result = Gogetit.libvirt.release(name)
+      Gogetit.set_result(result)
+
+      # post-tasks
+      if options['chef']
+        knife_remove(name, Gogetit.logger) if options[:chef]
+        update_databags(Gogetit.config, Gogetit.logger)
+      end
+    end
+
+    desc 'rebuild NAME', 'Destroy(or release) and create(or deploy)'\
+    ' either a container or a node(machine) in MAAS again.'
+    method_option :chef, :aliases => '-c', :type => :boolean, \
+      :default => false, :desc => 'Chef awareness'
+    def rebuild(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.')
+          invoke :destroy, [name]
+          alias_name = YAML.load(
+            Gogetit.get_result[:info][:config][:"user.user-data"]
+          )['source_image_alias']
+          invoke :create, [name], :alias => alias_name
         when 'libvirt'
-          Gogetit.libvirt.release(name)
+          invoke :release, [name]
+          distro_name = Gogetit.get_result[:info][:machine]['distro_series']
+          invoke :deploy, [name], :distro => distro_name
         else
           abort('Invalid argument entered.')
         end
@@ -123,12 +166,5 @@ module Gogetit
         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)
-    #   invoke :destroy, [name]
-    #   invoke :create, [type, name]
-    # end
   end
 end

data/lib/gogetit/util.rb

@@ -72,12 +72,14 @@ module Gogetit
           if JSON.parse(File.read(item_file))['vault']
             if items_as_is.include? item
               run_command(
-                "knife vault update #{bag} #{item} --json #{item_file} --search '*:*' -M client",
+                "knife vault update #{bag} #{item} --json #{item_file}"\
+                " --search '*:*' -M client",
                 logger
               )
             else
               run_command(
-                "knife vault create #{bag} #{item} --json #{item_file} --search '*:*' -M client",
+                "knife vault create #{bag} #{item} --json #{item_file}"\
+                " --search '*:*' -M client",
                 logger
               )
             end

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/providers/libvirt.rb

@@ -54,7 +54,8 @@ module Gogetit
         unless ifaces[0]['gateway_ip']
 
       # It seems the first IP has to belong to the untagged VLAN in the Fabric.
-      abort("The first IP you entered does not belong to the untagged VLAN in the Fabric.") \
+      abort("The first IP you entered does not belong to the untagged"\
+      " VLAN in the Fabric.") \
         unless ifaces[0]['vlan']['name'] == 'untagged'
 
       domain[:ifaces] = ifaces
@@ -70,7 +71,8 @@ module Gogetit
           elsif iface['vlan']['name'] != 'untagged'
             nic = {
               network: config[:default][:root_bridge],
-              portgroup: config[:default][:root_bridge] + '-' + iface['vlan']['vid'].to_s
+              portgroup: config[:default][:root_bridge] + '-' + \
+              iface['vlan']['vid'].to_s
             }
           end
           domain[:nic].push(nic)
@@ -81,7 +83,8 @@ module Gogetit
           if ifaces[0]['vlan']['name'] != 'untagged'
             nic = {
               network: config[:default][:root_bridge],
-              portgroup: config[:default][:root_bridge] + '-' + iface['vlan']['vid'].to_s
+              portgroup: config[:default][:root_bridge] + '-' + \
+              iface['vlan']['vid'].to_s
             }
             domain[:nic].push(nic)
           end
@@ -142,7 +145,8 @@ module Gogetit
 
     def create(name, options = nil)
       logger.info("Calling <#{__method__.to_s}>")
-      abort("Domain #{name} already exists! Please check both on MAAS and libvirt.") \
+      abort("Domain #{name} already exists!"\
+      " Please check both on MAAS and libvirt.") \
         if maas.domain_name_exists?(name) or domain_exists?(name)
 
       domain = config[:libvirt][:specs][:default]
@@ -206,12 +210,19 @@ module Gogetit
 
       logger.info("#{domain[:name]} has been created.")
       puts "ssh #{distro_name}@#{name}"
-      true
+
+      { result: true, info: domain }
     end
 
     def destroy(name)
       logger.info("Calling <#{__method__.to_s}>")
+
       system_id = maas.get_system_id(name)
+
+      info = {}
+      info[:machine] = \
+        maas.conn.request(:get, ['machines', system_id])
+
       if maas.machine_exists?(name)
         if maas.get_machine_state(system_id) == 'Deployed'
           logger.info("Calling to release...")
@@ -227,11 +238,14 @@ module Gogetit
       end
 
       dom = conn.lookup_domain_by_name(name)
+      info[:domain_xml] = dom.xml_desc
+
       dom.destroy if dom.active?
       Oga.parse_xml(dom.xml_desc).xpath('domain/devices/disk/source').each do |d|
         pool_path = d.attribute('file').value.split('/')[0..2].join('/')
         pools.each do |p|
-          if Oga.parse_xml(p.xml_desc).at_xpath('pool/target/path').inner_text == pool_path
+          if Oga.parse_xml(p.xml_desc).at_xpath('pool/target/path')\
+            .inner_text == pool_path
             logger.info("Deleting volume in #{p.name} pool.")
             p.lookup_volume_by_name(d.attribute('file').value.split('/')[3]).delete
           end
@@ -239,9 +253,9 @@ module Gogetit
       end
       dom.undefine
 
-      maas.refresh_pods
       logger.info("#{name} has been destroyed.")
-      true
+
+      { result: true, info: info }
     end
 
     def deploy(name, options = nil)
@@ -280,12 +294,18 @@ module Gogetit
 
       logger.info("#{name} has been created.")
       puts "ssh #{distro_name}@#{name}"
-      true
+      { result: true, info: distro }
     end
 
     def release(name)
       logger.info("Calling <#{__method__.to_s}>")
+
       system_id = maas.get_system_id(name)
+
+      info = {}
+      info[:machine] = \
+        maas.conn.request(:get, ['machines', system_id])
+
       if maas.machine_exists?(name)
         if maas.get_machine_state(system_id) == 'Deployed'
           logger.info("Calling to release...")
@@ -294,9 +314,9 @@ module Gogetit
         end
       end
 
-      maas.refresh_pods
       logger.info("#{name} has been released.")
-      true
+
+      { result: true, info: info }
     end
 
     def define_domain(domain)
@@ -368,9 +388,11 @@ module Gogetit
 
       volume_doc.at_xpath('volume/name').inner_text = volume_name
       volume_doc.at_xpath('volume/target/path').inner_text = volume_file
-      volume_doc.at_xpath('volume/capacity').inner_text = domain[:disk][:root][:capacity].to_s
+      volume_doc.at_xpath('volume/capacity').inner_text = \
+        domain[:disk][:root][:capacity].to_s
 
-      create_volume(domain[:disk][:root][:pool], Oga::XML::Generator.new(volume_doc).to_xml)
+      create_volume(domain[:disk][:root][:pool], \
+                    Oga::XML::Generator.new(volume_doc).to_xml)
       defined_volumes << volume_doc
 
       # For data(secondary) volumes

data/lib/providers/lxd.rb

@@ -46,7 +46,6 @@ module Gogetit
     def generate_user_data(args, options)
       logger.info("Calling <#{__method__.to_s}>")
 
-      args = {}
       args[:config] = {}
 
       if options['no-maas']
@@ -69,6 +68,7 @@ module Gogetit
         end
 
         args[:config][:"user.user-data"]['maas'] = true
+        args[:config][:"user.user-data"]['source_image_alias'] = args[:alias]
       end
 
       # To disable to update apt database on first boot
@@ -223,7 +223,8 @@ module Gogetit
         default_fabric = 'fabric-0'
 
         maas.get_subnets.each do |subnet|
-          if subnet['vlan']['name'] == 'untagged' and subnet['vlan']['fabric'] == default_fabric
+          if subnet['vlan']['name'] == 'untagged' and \
+              subnet['vlan']['fabric'] == default_fabric
             root_bridge_mtu = subnet['vlan']['mtu']
             break
           end
@@ -286,9 +287,7 @@ module Gogetit
       abort("Domain #{name}.#{maas.get_domain} already exists!") \
         if maas.domain_name_exists?(name) unless options['no-maas']
 
-      args = generate_user_data(args, options)
-      args = generate_network_config(args, options)
-      args = generate_devices(args, options)
+      args = {}
 
       if options['alias'].nil? or options['alias'].empty?
         args[:alias] = config[:lxd][:default_alias]
@@ -296,6 +295,10 @@ module Gogetit
         args[:alias] = options['alias']
       end
 
+      args = generate_user_data(args, options)
+      args = generate_network_config(args, options)
+      args = generate_devices(args, options)
+
       args[:sync] ||= true
 
       conn.create_container(name, args)
@@ -335,7 +338,7 @@ module Gogetit
         puts "ssh #{default_user}@#{name}"
       end
 
-      true
+      { result: true, info: args }
     end
 
     def destroy(name, args = {})
@@ -344,6 +347,8 @@ module Gogetit
       container = conn.container(name)
       args[:sync] ||= true
 
+      info = container.to_hash
+
       if get_state(name) == 'Running'
         conn.stop_container(name, args)
       end
@@ -380,7 +385,8 @@ module Gogetit
       # When multiple static IPs were reserved, it will not delete anything
       # since they are deleted when releasing the IPs above.
       logger.info("#{name} has been destroyed.")
-      true
+
+      { result: true, info: info }
     end
   end
 end

metadata

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