gogetit 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 962655473c69a249e4408ed2bd94918220731bd086d0762f8188ed95e3dbcc3c
-  data.tar.gz: 2c7d933ee6913ffcf5677c83a0aebdf0572a0a3393239eaece4f26273a62da13
+  metadata.gz: daf854e8f4d478ebf3e65b57eadc3e31e438cf879d80ff547397eaf618da64d1
+  data.tar.gz: 6dc5d664597f59dbec78653052ed86a1cce702662dec9c076058bdf558aef1b5
 SHA512:
-  metadata.gz: 7ce368bc57eafd01b89df3e99c8fbd4781f638e9013cc1b5bbd499cb0dbc698db99968ae361c146e1980aee2c34a4cd8600790b8e625cebc4e4d831197ccadee
-  data.tar.gz: 6efa5f931e8f83fe3f7dcb6e7e61ce023ef03ece9968b33f801e70d8368d3938cc91214cf3c249a9e17d9caf31c1e0b16986a127c97e51158afa6cc337efbf56
+  metadata.gz: cb4e8cf72354ce5f34a08de27e533923574ff051f0b58bbcfddffba4e3cf2269764564b1e666d1a024cfefc369e80d99e73763400d03374e5547d36639df068a
+  data.tar.gz: 7b6a6bd0d4ce389538938dde03e289b9ecb7b12bd881f57397842ce757aaed6cde623afdb4f55b4bfbdd3cc1f73fede7713c7d1592aa1a25b95d3516d4d0ea73

data/README.md

@@ -79,6 +79,7 @@ gogetit create lxd01 --no-maas -f lxd_without_maas_vlans.yml
 
 # to install MAAS on a lxc container using 'no-maas' option
 gogetit create lxd01 --no-maas -f lxd_without_maas_vlans.yml --maas-on-lxc
+# --maas-on-lxc can be used alone
 
 gogetit destroy lxd01
 

data/lib/gogetit/cli.rb

@@ -85,8 +85,6 @@ module Gogetit
         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' 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.") \

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.18.2"
+  VERSION = "0.19.0"
 end

data/lib/providers/lxd.rb

@@ -53,9 +53,6 @@ module Gogetit
 
       if options['no-maas']
         args[:config][:"user.user-data"] = {}
-        if options['maas-on-lxc']
-          args[:config][:"security.privileged"] = "true"
-        end
       else
         sshkeys = maas.get_sshkeys
         pkg_repos = maas.get_package_repos
@@ -76,6 +73,10 @@ module Gogetit
         args[:config][:"user.user-data"]['maas'] = true
       end
 
+      if options['maas-on-lxc']
+        args[:config][:"security.privileged"] = "true"
+      end
+
       if options['lxd-in-lxd']
         args[:config][:"security.nesting"] = "true"
       end
@@ -283,14 +284,6 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
       if options['no-maas']
         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|
@@ -363,6 +356,16 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
         }
       end
 
+      if options['maas-on-lxc']
+        # 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
+      end
+
       return args
     end
 
@@ -405,6 +408,9 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
     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)
 
@@ -432,7 +438,7 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
 
       # 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['no-maas'] and 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"] = "\

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler