gogetit 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8907083242126e73dddd139d9e763457cf37a6b6bcc4dd571b405ff70e1e9052
-  data.tar.gz: a15dd0a170a63825fe70e5677719f2bb6b2cae5b90d520a14ab8687acac2b5ab
+  metadata.gz: feea9f469e99f44736df03434f39e6656ff98f539e2984c9612c48dbf3e517e9
+  data.tar.gz: 7ffd7149dd8da0571ba1f12ae50126431949431798c1fa52253c9fb8ac750751
 SHA512:
-  metadata.gz: afb2d8cb2b3ac18f07cdedc8bacb1177e7fdc83e37bea752c6a042492dd147d40d6c98ad5555d2c466b48761c4aa9d37f519497237395d47cc5f621c56851c5b
-  data.tar.gz: 95b329fd114ec4623be32d2eaa916e5ceebd42155d99a9a2ee0e1ee9292d5f5a6339709660967092320158e236817c3e2ed7405cd80c1a1061485bde5ca68df9
+  metadata.gz: 5ad95329dabf38ba47b066d7b8e8aa907675e34304afd7449c17157a54ee87e1758611dfef033682f62225ab1134237fd21b9e5638ac67a10d54d408fb753dc7
+  data.tar.gz: eca792979825cbec1db67566e76ddeedb2b8eafb5edd4613b40e48f3e4d51e093933c7c53f259d836149a25e69bf2c60142bf45ad4aaf05c340687ea24ae4f95

data/lib/gogetit/cli.rb

@@ -77,22 +77,16 @@ module Gogetit
     def create(name)
       abort("'vlans' and 'ipaddresses' can not be set together.") \
         if options['vlans'] and options['ipaddresses']
-
       abort("'chef' and 'zero' can not be set together.") \
         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'])
-
       abort("'no-maas' and 'file' have to be set together.") \
         if options['no-maas'] ^ !!options['file']
-
-      abort("'maas-on-lxc' and 'no-maas' have to be set together.") \
-        if options['maas-on-lxc'] ^ !!options['no-maas']
-
+      abort("'maas-on-lxc' has to be set with 'no-maas'.") \
+        if options['maas-on-lxc'] and !options['no-maas']
       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'
 

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/lib/providers/lxd.rb

@@ -271,8 +271,16 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
       args[:devices] = {}
 
       if options['no-maas']
-        args[:devices] = \
-          (Hashie.symbolize_keys YAML.load_file(options['file'])['devices'])
+        args[:devices] = YAML.load_file(options['file'])['devices']
+
+        # https://docs.maas.io/2.4/en/installconfig-lxd-install
+        for i in 0..7
+          i = i.to_s
+          args[:devices]["loop" + i] = {}
+          args[:devices]["loop" + i]["path"] = "/dev/loop" + i
+          args[:devices]["loop" + i]["type"] = "unix-block"
+        end
+
         # Now, LXD API can handle integer as a value of a map
         args[:devices].each do |k, v|
           v.each do |kk, vv|
@@ -282,6 +290,8 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
           end
         end
 
+        args[:devices] = (Hashie.symbolize_keys args[:devices])
+
       elsif options['ipaddresses']
         options[:ifaces].each_with_index do |iface,index|
           if index == 0
@@ -414,6 +424,7 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
       # Adding configurations that are necessary for shipping MAAS on lxc
       if options['no-maas'] and options['maas-on-lxc']
         container.config = container.config.to_hash
+        # https://docs.maas.io/2.4/en/installconfig-lxd-install
         container.config[:"raw.lxc"] = "\
 lxc.cgroup.devices.allow = c 10:237 rwm\n\
 lxc.aa_profile = unconfined\n\

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler