gogetit 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 464e5d5917a8099932499111b3540bc4583e3aea
-  data.tar.gz: 48e2244bc27a2a78050ff2008112193a555db036
+SHA256:
+  metadata.gz: 8df3851228231fb78944cfc6bd359085e06b543a8e8aa2635d805200b3431af0
+  data.tar.gz: 405754156d02512f66b46f29816a318c7fd408b4d82a323c7c1173142470d85b
 SHA512:
-  metadata.gz: 34786d8600ecec360d2bb942ee9fcb9bcf4272745bf55760296146f02e0f789331a128503e318649c59859b9904955f2976f8ff27201956978f337502fdd2aaf
-  data.tar.gz: bc38cea16984bf6215b62fe1ddbcbe28c82ad1c4601fbc79363053e8f50be8eb13e68be44318837498005f1960f35a01dbb706dfacfed53d925dc9d7170683ae
+  metadata.gz: e899cfdce09867e0ee0c6f18cce4462b048638aa89d22f91f69f317c14ac65919224a08d4487a8e79fd6f9c0533508864d2f7d387aae9ef7f6f33dc7f2aa3942
+  data.tar.gz: 47b1ca4e2f0d0452de15f5b9308c3ef099289d482a00b519343a42c268e6832f2f45e99362f49785acae589d56b2571c0d6c8726f2a2eb67020cc176805133c4

data/lib/gogetit/util.rb

@@ -167,19 +167,20 @@ module Gogetit
           item_file = data_bags_dir+'/'+bag+'/'+item
           item = item.gsub('.json', '')
           if JSON.parse(File.read(item_file))['vault']
+            # We assumes you have configured 'mode' and 'admins' on your knife.rb
             if items_as_is.include? item
               run_command(
                 "knife vault update #{bag} #{item} --json #{item_file}"\
-                " --search '*:*' -M client"
+                " --search '*:*'"
               )
             else
               run_command(
                 "knife vault create #{bag} #{item} --json #{item_file}"\
-                " --search '*:*' -M client"
+                " --search '*:*'"
               )
             end
             run_command(
-              "knife vault refresh #{bag} #{item} --clean-unknown-clients -M client"
+              "knife vault refresh #{bag} #{item} --clean-unknown-clients"
             )
           else
             run_command("knife data bag from file #{bag} #{item_file}")

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

data/lib/providers/lxd.rb

@@ -52,8 +52,7 @@ module Gogetit
       args[:config] = {}
 
       if options['no-maas']
-        args[:config][:'user.user-data'] = \
-          YAML.load_file(options['file'])[:config]['user.user-data']
+        args[:config][:"user.user-data"] = {}
       else
         sshkeys = maas.get_sshkeys
         pkg_repos = maas.get_package_repos
@@ -163,13 +162,18 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
 
     def generate_network_config(args, options)
       logger.info("Calling <#{__method__.to_s}>")
+
       if options['no-maas']
         args[:config][:'user.network-config'] = \
-          YAML.load_file(options['file'])[:config][:'user.network-config']
+          YAML.load_file(options['file'])['network']
+
+        # physical device will be the gate device
+        args[:config][:"user.network-config"]['config'].each do |iface|
+          if iface['type'] == "physical"
+            options['ip_to_access'] = iface['subnets'][0]['address'].split('/')[0]
+          end
+        end
 
-        options['ip_to_access'] = \
-          args[:config][:"user.network-config"]['config'][1]['subnets'][0]['address']
-          .split('/')[0]
         args[:config][:"user.network-config"] = \
           YAML.dump(args[:config][:"user.network-config"])[4..-1]
 
@@ -258,7 +262,15 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
 
       if options['no-maas']
         args[:devices] = \
-          YAML.load_file(options['file'])[:devices]
+          (Hashie.symbolize_keys YAML.load_file(options['file'])['devices'])
+        # Now, LXD API can handle integer as a value of a map
+        args[:devices].each do |k, v|
+          v.each do |kk, vv|
+            if vv.is_a? Integer
+              v[kk] = vv.to_s
+            end
+          end
+        end
 
       elsif options['ipaddresses']
         options[:ifaces].each_with_index do |iface,index|
@@ -387,6 +399,9 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
       container = conn.container(name)
 
       container.devices = args[:devices].merge!(container.devices.to_hash)
+
+      require 'pry'; binding.pry
+
       conn.update_container(name, container)
       # Fetch container object again
       container = conn.container(name)

data/lib/sample_conf/lxd_without_maas.yml

@@ -12,7 +12,6 @@
         ipv4: true
         address: 192.168.112.10/24
         gateway: 192.168.112.1
-        mtu: 8954
         control: auto
     - type: physical
       name: eth1
@@ -20,7 +19,6 @@
       - type: static
         ipv4: true
         address: 192.168.113.10/24
-        mtu: 8954
         control: auto
     - type: physical
       name: eth2
@@ -28,7 +26,6 @@
       - type: static
         ipv4: true
         address: 192.168.114.10/24
-        mtu: 8954
         control: auto
   user.user-data:
     ssh_authorized_keys:

data/lib/sample_conf/lxd_without_maas_vlans.yml

@@ -12,7 +12,6 @@
         ipv4: true
         address: 192.168.111.10/24
         gateway: 192.168.111.1
-        mtu: 8954
         control: auto
     - type: vlan
       name: eth0.112
@@ -22,7 +21,6 @@
       - type: static
         ipv4: true
         address: 192.168.112.10/24
-        mtu: 8954
         control: auto
     - type: vlan
       name: eth0.113
@@ -32,7 +30,6 @@
       - type: static
         ipv4: true
         address: 192.168.113.10/24
-        mtu: 8954
         control: auto
   user.user-data:
     ssh_authorized_keys:
@@ -41,7 +38,7 @@
     apt_mirror: http://kr.archive.ubuntu.com/ubuntu
 :devices:
   :eth0:
-    :mtu: '8954'
+    :mtu: "8954"
     :name: eth0
     :nictype: bridged
     :parent: $root_bridge

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Libraries with a CLI tool for dealing with things like MAAS, LXD and Libvirt.