gogetit 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df3851228231fb78944cfc6bd359085e06b543a8e8aa2635d805200b3431af0
-  data.tar.gz: 405754156d02512f66b46f29816a318c7fd408b4d82a323c7c1173142470d85b
+  metadata.gz: 8907083242126e73dddd139d9e763457cf37a6b6bcc4dd571b405ff70e1e9052
+  data.tar.gz: a15dd0a170a63825fe70e5677719f2bb6b2cae5b90d520a14ab8687acac2b5ab
 SHA512:
-  metadata.gz: e899cfdce09867e0ee0c6f18cce4462b048638aa89d22f91f69f317c14ac65919224a08d4487a8e79fd6f9c0533508864d2f7d387aae9ef7f6f33dc7f2aa3942
-  data.tar.gz: 47b1ca4e2f0d0452de15f5b9308c3ef099289d482a00b519343a42c268e6832f2f45e99362f49785acae589d56b2571c0d6c8726f2a2eb67020cc176805133c4
+  metadata.gz: afb2d8cb2b3ac18f07cdedc8bacb1177e7fdc83e37bea752c6a042492dd147d40d6c98ad5555d2c466b48761c4aa9d37f519497237395d47cc5f621c56851c5b
+  data.tar.gz: 95b329fd114ec4623be32d2eaa916e5ceebd42155d99a9a2ee0e1ee9292d5f5a6339709660967092320158e236817c3e2ed7405cd80c1a1061485bde5ca68df9

data/README.md

@@ -74,6 +74,9 @@ gogetit deploy kvm01 -d centos
 gogetit create lxd01 --no-maas -f lxd_without_maas.yml
 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
+
 gogetit destroy lxd01
 
 # This feature is broken and might be deprecated in the future.

data/lib/gogetit/cli.rb

@@ -69,6 +69,9 @@ module Gogetit
       :desc => 'A list of static IPs to assign'
     method_option :"no-maas", :type => :boolean, \
       :desc => 'Without MAAS awareness(only for LXD provider)'
+    method_option :"maas-on-lxc", :type => :boolean, \
+      :desc => 'To install MAAS on a LXC enabling necessary user config'\
+      '(only for LXD provider with no-maas enabled)'
     method_option :"file", :aliases => '-f', :type => :string, \
       :desc => 'File location(only for LXD provider)'
     def create(name)
@@ -84,6 +87,9 @@ module Gogetit
       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("'distro' has to be set with libvirt provider.") \
         if options['distro'] and options['provider'] == 'lxd'
 

data/lib/gogetit/version.rb

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

data/lib/providers/lxd.rb

@@ -53,6 +53,9 @@ 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
@@ -80,7 +83,7 @@ module Gogetit
       args[:config][:'user.user-data']['package_update'] = false
       args[:config][:'user.user-data']['package_upgrade'] = false
 
-      generate_cloud_init_config(config, args)
+      generate_cloud_init_config(options, config, args)
 
       args[:config][:"user.user-data"] = \
         "#cloud-config\n" + YAML.dump(args[:config][:"user.user-data"])[4..-1]
@@ -88,11 +91,18 @@ module Gogetit
       return args
     end
 
-    def generate_cloud_init_config(config, args)
+    def generate_cloud_init_config(options, config, args)
       logger.info("Calling <#{__method__.to_s}>")
+      if options['no-maas']
+        # When there is no MAAS, containers should be able to resolve
+        # their name with hosts file.
+        args[:config][:'user.user-data']['manage_etc_hosts'] = true
+      end
+
       # To add truested root CA certificates
       # https://cloudinit.readthedocs.io/en/latest/topics/examples.html
       # #configure-an-instances-trusted-ca-certificates
+      #
       if config[:cloud_init] && config[:cloud_init][:ca_certs]
         args[:config][:'user.user-data']['ca-certs'] = {}
         certs = []
@@ -400,7 +410,15 @@ echo \"RevokedKeys #{config[:cloud_init][:ssh_ca_public_key][:revocation_path]}\
 
       container.devices = args[:devices].merge!(container.devices.to_hash)
 
-      require 'pry'; binding.pry
+      # 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']
+        container.config = container.config.to_hash
+        container.config[:"raw.lxc"] = "\
+lxc.cgroup.devices.allow = c 10:237 rwm\n\
+lxc.aa_profile = unconfined\n\
+lxc.cgroup.devices.allow = b 7:* rwm"
+      end
 
       conn.update_container(name, container)
       # Fetch container object again

metadata

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