gogetit 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c995acc5f536c6cd8b860e0c025d5da14d55a5b00cba8fae71cba612a81aa0
-  data.tar.gz: 512981119248e95559725188ce2203ba85b520e224d4948691ebbb30ce6f39f1
+  metadata.gz: cec3025d3d37da25d264556d84373b5211c09640877117aaf2edfde182545f64
+  data.tar.gz: e7e3d060a85d03cf7720f9563582f35c45472eb53dd338c47b6abef3393ad036
 SHA512:
-  metadata.gz: 76757d10c32ed818bbff5749259ba0031b0025d2bad170dcab8d79396c3a09a259ddc9f7254ea4a5e3dcee48b702c591a8b4401f4401d6d60b34d3a3aa5a4866
-  data.tar.gz: 9a56506d5b228f248105f456306bb342728ce4f966a50c7cfb8f4310692c8216a08287cb794137dad9c89e7ada8c6159fb2b49b840af86cd1c3b5ff2dfb8306d
+  metadata.gz: 4c55e8011cbd55993e901135cf4fdb0b8eca24c8abe8c5b78e43f233396689eb6a4931569245f898d3794cf7c7d350a9b3da125dfdb4d169b9462921edf73a25
+  data.tar.gz: 19798bb065fba34ac5f6c51ebf699bed5cab7e9143d26bcc97ae335e21d43c8d454899a827a5c01735fc383ed5bff5dfe2d24415afeb64c4bb27a7b708396e29

data/lib/gogetit/cli.rb

@@ -78,32 +78,32 @@ module Gogetit
       :desc => 'File location(only for LXD provider)'
     def create(name)
       abort("'vlans' and 'ipaddresses' can not be set together.") \
-        if options['vlans'] and options['ipaddresses']
+        if options[:vlans] and options[:ipaddresses]
       abort("'chef' and 'zero' can not be set together.") \
-        if options['chef'] and options['zero']
+        if options[:chef] and options[:zero]
       abort("when 'no-maas', the network configuration have to be set by 'file'.") \
-        if options['no-maas'] and (options['vlans'] or options['ipaddresses'])
+        if options[:'no-maas'] and (options[:vlans] or options[:ipaddresses])
       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'
+        if options[:'no-maas'] ^ !!options[:file]
+      abort("'distro' has to be set only 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'
+        if options[:alias] and options[:provider] == 'libvirt'
 
-      case options['provider']
+      case options[:provider]
       when 'lxd'
-        Gogetit::CLI.result = lxd.create(name, options.to_hash)
+        Gogetit::CLI.result = lxd.create(name, options)
       when 'libvirt'
-        Gogetit::CLI.result = libvirt.create(name, options.to_hash)
+        Gogetit::CLI.result = libvirt.create(name, options)
       else
         abort('Invalid argument entered.')
       end
 
       # post-tasks
-      if options['chef']
+      if options[:chef]
         knife_bootstrap_chef(name, options[:provider], config)
         update_databags(config)
-      elsif options['zero']
+      elsif options[:zero]
         knife_bootstrap_zero(name, options[:provider], config)
       end
     end
@@ -115,7 +115,7 @@ module Gogetit
       :default => false, :desc => 'Chef Zero awareness'
     def destroy(name)
       abort("'chef' and 'zero' can not be set together.") \
-        if options['chef'] and options['zero']
+        if options[:chef] and options[:zero]
 
       provider = get_provider_of(name, providers)
       if provider
@@ -129,10 +129,10 @@ module Gogetit
         end
       end
       # post-tasks
-      if options['chef']
+      if options[:chef]
         knife_remove(name, options)
         update_databags(config)
-      elsif options['zero']
+      elsif options[:zero]
         knife_remove(name, options)
       end
     end
@@ -146,15 +146,15 @@ module Gogetit
       :default => false, :desc => 'Chef Zero awareness'
     def deploy(name)
       abort("'chef' and 'zero' can not be set together.") \
-        if options['chef'] and options['zero']
+        if options[:chef] and options[:zero]
 
-      Gogetit::CLI.result = libvirt.deploy(name, options.to_hash)
+      Gogetit::CLI.result = libvirt.deploy(name, options)
 
       # post-tasks
-      if options['chef']
+      if options[:chef]
         knife_bootstrap(name, options[:provider], config)
         update_databags(config)
-      elsif options['zero']
+      elsif options[:zero]
         knife_bootstrap_zero(name, options[:provider], config)
       end
     end
@@ -167,15 +167,15 @@ module Gogetit
       :default => false, :desc => 'Chef Zero awareness'
     def release(name)
       abort("'chef' and 'zero' can not be set together.") \
-        if options['chef'] and options['zero']
+        if options[:chef] and options[:zero]
 
       Gogetit::CLI.result = libvirt.release(name)
 
       # post-tasks
-      if options['chef']
+      if options[:chef]
         knife_remove(name, options)
         update_databags(config)
-      elsif options['zero']
+      elsif options[:zero]
         knife_remove(name, options)
       end
     end
@@ -188,7 +188,7 @@ module Gogetit
       :default => false, :desc => 'Chef Zero awareness'
     def rebuild(name)
       abort("'chef' and 'zero' can not be set together.") \
-        if options['chef'] and options['zero']
+        if options[:chef] and options[:zero]
 
       provider = get_provider_of(name, providers)
       if provider
@@ -212,7 +212,7 @@ module Gogetit
         end
       end
       # post-tasks
-      if options['chef']
+      if options[:chef]
         knife_remove(name) if options[:chef]
         update_databags(config)
       end

data/lib/gogetit/util.rb

@@ -104,7 +104,7 @@ module Gogetit
     def knife_remove(name, options)
       logger.info("Calling <#{__method__.to_s}>")
       if find_executable 'knife'
-        if options['chef']
+        if options[:chef]
           if system('knife ssl check')
             logger.info("With chef-server..")
             puts "Deleting node #{name}.."
@@ -116,7 +116,7 @@ module Gogetit
           else
             abort('knife is not configured properly.')
           end
-        elsif options['zero']
+        elsif options[:zero]
           logger.info("With chef-zero..")
           puts "Deleting node #{name}.."
           logger.info("knife node delete -y #{name}")
@@ -270,7 +270,7 @@ module Gogetit
       # preserve source list for a while
       user_data['apt']['preserve_sources_list'] = true
 
-      if options['no-maas']
+      if options[:'no-maas']
         # When there is no MAAS, containers should be able to resolve
         # their name with hosts file.
         user_data['manage_etc_hosts'] = true

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.21.0"
+  VERSION = "0.21.1"
 end

data/lib/providers/libvirt.rb

@@ -4,6 +4,8 @@ require 'oga'
 require 'rexml/document'
 require 'gogetit/util'
 require 'yaml'
+require 'base64'
+require 'hashie'
 
 module Gogetit
   class GogetLibvirt
@@ -161,11 +163,11 @@ module Gogetit
       domain = config[:libvirt][:specs][:default]
       ifaces = nil
 
-      if options['ipaddresses']
-        ifaces = check_ip_available(options['ipaddresses'], maas)
+      if options[:ipaddresses]
+        ifaces = check_ip_available(options[:ipaddresses], maas)
         domain = generate_nics(ifaces, domain)
-      elsif options['vlans']
-        #check_vlan_available(options['vlans'])
+      elsif options[:vlans]
+        #check_vlan_available(options[:vlans])
       else
         domain[:nic] = [
           {
@@ -184,10 +186,10 @@ module Gogetit
       system_id = maas.get_system_id(domain[:name])
       maas.wait_until_state(system_id, 'Ready')
 
-      if options['ipaddresses']
+      if options[:ipaddresses]
         configure_interfaces(ifaces, system_id)
-      elsif options['vlans']
-        #check_vlan_available(options['vlans'])
+      elsif options[:vlans]
+        #check_vlan_available(options[:vlans])
       else
       end
 
@@ -250,10 +252,11 @@ module Gogetit
         distro = options[:distro]
       end
 
-      require 'base64'
       user_data = Base64.encode64(
         "#cloud-config\n" +
-        YAML.dump(generate_cloud_init_config(options, config))[4..-1]
+        YAML.dump(
+          generate_cloud_init_config(options, config)
+        )[4..-1]
       )
 
       maas.conn.request(

data/lib/providers/lxd.rb

@@ -51,7 +51,7 @@ module Gogetit
 
       lxd_params[:config] = {}
 
-      if options['no-maas']
+      if options[:'no-maas']
         lxd_params[:config][:"user.user-data"] = {}
       else
         sshkeys = maas.get_sshkeys
@@ -73,11 +73,11 @@ module Gogetit
         lxd_params[:config][:"user.user-data"]['maas'] = true
       end
 
-      if options['maas-on-lxc']
+      if options[:'maas-on-lxc']
         lxd_params[:config][:"security.privileged"] = "true"
       end
 
-      if options['lxd-in-lxd']
+      if options[:'lxd-in-lxd']
         lxd_params[:config][:"security.nesting"] = "true"
       end
 
@@ -103,22 +103,22 @@ module Gogetit
     def generate_network_config(lxd_params, options)
       logger.info("Calling <#{__method__.to_s}>")
 
-      if options['no-maas']
+      if options[:'no-maas']
         lxd_params[:config][:'user.network-config'] = \
-          YAML.load_file(options['file'])['network']
+          YAML.load_file(options[:file])['network']
 
         # physical device will be the gate device
         lxd_params[:config][:"user.network-config"]['config'].each do |iface|
           if iface['type'] == "physical"
-            options['ip_to_access'] = iface['subnets'][0]['address'].split('/')[0]
+            options[:ip_to_access] = iface['subnets'][0]['address'].split('/')[0]
           end
         end
 
         lxd_params[:config][:"user.network-config"] = \
           YAML.dump(lxd_params[:config][:"user.network-config"])[4..-1]
 
-      elsif options['ipaddresses']
-        options[:ifaces] = check_ip_available(options['ipaddresses'], maas)
+      elsif options[:ipaddresses]
+        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.") \
@@ -200,8 +200,8 @@ module Gogetit
       logger.info("Calling <#{__method__.to_s}>")
       lxd_params[:devices] = {}
 
-      if options['no-maas']
-        lxd_params[:devices] = YAML.load_file(options['file'])['devices']
+      if options[:'no-maas']
+        lxd_params[:devices] = YAML.load_file(options[:file])['devices']
 
         # Now, LXD API can handle integer as a value of a map
         lxd_params[:devices].each do |k, v|
@@ -214,7 +214,7 @@ module Gogetit
 
         lxd_params[:devices] = (Hashie.symbolize_keys lxd_params[:devices])
 
-      elsif options['ipaddresses']
+      elsif options[:ipaddresses]
         options[:ifaces].each_with_index do |iface,index|
           if index == 0
             if iface['vlan']['name'] == 'untagged' # or vid == 0
@@ -275,7 +275,7 @@ module Gogetit
         }
       end
 
-      if options['maas-on-lxc']
+      if options[:'maas-on-lxc']
         # https://docs.maas.io/2.4/en/installconfig-lxd-install
         for i in 0..7
           i = i.to_s
@@ -327,21 +327,18 @@ module Gogetit
     def create(name, options = {})
       logger.info("Calling <#{__method__.to_s}>")
 
-      # options from the kitchen driver have keys as symbol
-      Hashie.stringify_keys! options
-
       abort("Container #{name} already exists!") \
         if container_exists?(name)
 
       abort("Domain #{name}.#{maas.get_domain} already exists!") \
-        if maas.domain_name_exists?(name) unless options['no-maas']
+        if maas.domain_name_exists?(name) unless options[:'no-maas']
 
       lxd_params = {}
 
-      if options['alias'].nil? or options['alias'].empty?
+      if options[:alias].nil? or options[:alias].empty?
         lxd_params[:alias] = config[:lxd][:default_alias]
       else
-        lxd_params[:alias] = options['alias']
+        lxd_params[:alias] = options[:alias]
       end
 
       lxd_params = generate_user_data(lxd_params, options)
@@ -357,7 +354,7 @@ module Gogetit
 
       # https://github.com/jeffshantz/hyperkit/blob/master/lib/hyperkit/client/containers.rb#L240
       # Adding configurations that are necessary for shipping MAAS on lxc
-      if options['maas-on-lxc']
+      if options[:'maas-on-lxc']
         container.config = container.config.to_hash
         # https://docs.maas.io/2.4/en/installconfig-lxd-install
         container.config[:"raw.lxc"] = "\
@@ -371,13 +368,13 @@ lxc.cgroup.devices.allow = b 7:* rwm"
       container = conn.container(name)
 
       reserve_ips(name, options, container) \
-        if options['vlans'] or options['ipaddresses'] \
-          unless options['no-maas']
+        if options[:vlans] or options[:ipaddresses] \
+          unless options[:'no-maas']
 
       conn.start_container(name, :sync=>"true")
 
-      if options['no-maas']
-        ip_or_fqdn = options['ip_to_access']
+      if options[:'no-maas']
+        ip_or_fqdn = options[:ip_to_access]
       else
         ip_or_fqdn = name + '.' + maas.get_domain
       end
@@ -395,8 +392,8 @@ lxc.cgroup.devices.allow = b 7:* rwm"
       wait_until_available(ip_or_fqdn, default_user)
       logger.info("#{name} has been created.")
 
-      if options['no-maas']
-        puts "ssh #{default_user}@#{options['ip_to_access']}"
+      if options[:'no-maas']
+        puts "ssh #{default_user}@#{options[:ip_to_access]}"
       else
         puts "ssh #{default_user}@#{name}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler