gogetit 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eece96e8731a88531e7acb63f44b960d4a674cd9
-  data.tar.gz: 69eda3942e9e7ed98edb508fe2c42894aa206b07
+  metadata.gz: 148adb0a4d5bf1227bba264f035bf222b6a3c5bf
+  data.tar.gz: f8d3d1a7f5762574f08acdc470f663c7d103ae9f
 SHA512:
-  metadata.gz: a24f807fd2271e9c7336cfbb187d5cb7a30d00b3fa3091a2bf43f8988844b575a34a20e1b30d785974253bbab747259cd26ed6357c21f389183bc231f654084b
-  data.tar.gz: 724ba1bceefcf866b18d18665eab1e39997920ffd8fd79a6e1d416376432e8a8def9b082f91734689652581c4051966ce63a069681bab4f5eceffbe3738f07f9
+  metadata.gz: ab49648f3d9db3e552b523716ab85f1271952249fc392a970f812212d3511812256d246e2f2e2d9336b15a550d11ecccc7ed12d089e31def95fbc46ce2662b4e
+  data.tar.gz: 547011a4d9d806019e802eb6e890080354f521b2ca048c170288e36442b270d268c9f68a7852c03a5c2227c895986060e92e1c229d03bc799013a13f6960fee0

data/README.md

@@ -56,6 +56,10 @@ gogetit create lxd01 -p lxd -i 192.168.10.10 10.0.0.2
 gogetit create kvm01 -p libvirt
 gogetit create kvm01 -p libvirt -i 192.168.10.10 10.0.0.2
 
+# to create a LXD container without MAAS awareness
+gogetit create lxd01 --no-maas -f lxd_without_maas.yml
+gogetit create lxd01 --no-maas -f lxd_without_maas_vlans.yml
+
 # to provision with a bare metal machine
 # gogetit create kvm01 -p bare
 

data/lib/gogetit/cli.rb

@@ -21,16 +21,25 @@ module Gogetit
       :default => 'lxd', :desc => 'A provider such as lxd and libvirt'
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
-
     method_option :vlans, :aliases => '-v', :type => :array, \
       :desc => 'A list of VLAN IDs to connect to'
     method_option :ipaddresses, :aliases => '-i', :type => :array, \
       :desc => 'A list of static IPs to assign'
+    method_option :"no-maas", :type => :boolean, \
+      :desc => 'Without MAAS awareness'
+    method_option :"file", :aliases => '-f', :type => :string, \
+      :desc => 'File location'
     def create(name)
-      abort("vlans and ipaddresses can not be used at the same time.") \
+      abort("'vlans' and 'ipaddresses' can not be set together.") \
         if options['vlans'] and options['ipaddresses']
 
-      case options[:provider]
+      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']
+
+      case options['provider']
       when 'lxd'
         Gogetit.lxd.create(name, options.to_hash)
       when 'libvirt'
@@ -40,12 +49,10 @@ module Gogetit
       end
 
       # post-tasks
-      if options[:chef]
+      if options['chef']
         knife_bootstrap(name, options[:provider], Gogetit.config, Gogetit.logger)
         update_databags(Gogetit.config, Gogetit.logger)
       end
-      Gogetit.config[:default][:user] ||= ENV['USER']
-      puts "ssh #{Gogetit.config[:default][:user]}@#{name}"
     end
 
     desc 'destroy NAME', 'Destroy either a container or KVM domain.'
@@ -64,7 +71,7 @@ module Gogetit
         end
       end
       # post-tasks
-      if options[:chef]
+      if options['chef']
         knife_remove(name, Gogetit.logger) if options[:chef]
         update_databags(Gogetit.config, Gogetit.logger)
       end

data/lib/gogetit/util.rb

@@ -141,32 +141,32 @@ module Gogetit
 		  end
 		end
 
-    def wait_until_available(fqdn, logger)
+    def wait_until_available(ip_or_fqdn, logger)
       logger.info("Calling <#{__method__.to_s}>")
-      until ping_available?(fqdn, logger)
+      until ping_available?(ip_or_fqdn, logger)
         logger.info("Calling <#{__method__.to_s}> for ping to be ready..")
         sleep 3
       end
-      logger.info("#{fqdn} is now available to ping..")
+      logger.info("#{ip_or_fqdn} is now available to ping..")
 
-      until ssh_available?(fqdn, 'ubuntu', logger)
+      until ssh_available?(ip_or_fqdn, 'ubuntu', logger)
         logger.info("Calling <#{__method__.to_s}> for ssh to be ready..")
         sleep 3
       end
-      logger.info("#{fqdn} is now available to ssh..")
+      logger.info("#{ip_or_fqdn} is now available to ssh..")
     end
 
     def ping_available?(host, logger)
-      # host can be both IP and FQDN.
+      # host can be both IP and ip_or_fqdn.
       logger.info("Calling <#{__method__.to_s}> for #{host}")
       `ping -c 1 -W 1 #{host}`
       $?.exitstatus == 0
     end
 
-    def ssh_available?(fqdn, user, logger)
+    def ssh_available?(ip_or_fqdn, user, logger)
       logger.info("Calling <#{__method__.to_s}>")
       begin
-        Net::SSH.start(fqdn, user).class
+        Net::SSH.start(ip_or_fqdn, user).class
       rescue Exception => e
         puts e
       end

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/providers/libvirt.rb

@@ -59,13 +59,13 @@ module Gogetit
         if index == 0
           if iface['vlan']['name'] == 'untagged'
             nic = {
-              network: config[:default][:native_bridge],
-              portgroup: config[:default][:native_bridge]
+              network: config[:default][:root_bridge],
+              portgroup: config[:default][:root_bridge]
             }
           elsif iface['vlan']['name'] != 'untagged'
             nic = {
-              network: config[:default][:native_bridge],
-              portgroup: config[:default][:native_bridge] + '-' + iface['vlan']['vid'].to_s
+              network: config[:default][:root_bridge],
+              portgroup: config[:default][:root_bridge] + '-' + iface['vlan']['vid'].to_s
             }
           end
           domain[:nic].push(nic)
@@ -75,8 +75,8 @@ module Gogetit
           # This will not be hit as of now and might be deprecated.
           if ifaces[0]['vlan']['name'] != 'untagged'
             nic = {
-              network: config[:default][:native_bridge],
-              portgroup: config[:default][:native_bridge] + '-' + iface['vlan']['vid'].to_s
+              network: config[:default][:root_bridge],
+              portgroup: config[:default][:root_bridge] + '-' + iface['vlan']['vid'].to_s
             }
             domain[:nic].push(nic)
           end
@@ -100,8 +100,8 @@ module Gogetit
       else
         domain[:nic] = [
           {
-            network: config[:default][:native_bridge],
-            portgroup: config[:default][:native_bridge]
+            network: config[:default][:root_bridge],
+            portgroup: config[:default][:root_bridge]
           }
         ]
       end

data/lib/providers/lxd.rb

@@ -42,44 +42,77 @@ module Gogetit
       end
     end
 
-    def generate_args(args, options)
+    # to generate 'user.user-data'
+    def generate_user_data(args, options)
       logger.info("Calling <#{__method__.to_s}>")
-      args[:devices] = {}
 
-      ifaces = check_ip_available(options['ipaddresses'], maas, logger)
-      abort("There is no dns server specified for the gateway network.") \
-        unless ifaces[0]['dns_servers'][0]
-      abort("There is no gateway specified for the gateway network.") \
-        unless ifaces[0]['gateway_ip']
-      args[:ifaces] = ifaces
-      args[:config][:'user.network-config'] = {
-        'version' => 1,
-        'config' => [
-          {
-            'type' => 'nameserver',
-            'address' => ifaces[0]['dns_servers'][0]
-          }
-        ]
-      }
+      args = {}
+      args[:config] = {}
 
-      ifaces.each_with_index do |iface,index|
-        if index == 0
-          iface_conf = {
-            'type' => 'physical',
-            'name' => "eth#{index}",
-            'subnets' => [
-              {
-                'type' => 'static',
-                'ipv4' => true,
-                'address' => iface['ip'] + '/' + iface['cidr'].split('/')[1],
-                'gateway' => iface['gateway_ip'],
-                'mtu' => iface['vlan']['mtu'],
-                'control' => 'auto'
-              }
-            ]
-          }
-        elsif index > 0
-          if ifaces[0]['vlan']['name'] != 'untagged'
+      if options['no-maas']
+        args[:config][:'user.user-data'] = \
+          YAML.load_file(options['file'])[:config]['user.user-data']
+      else
+        sshkeys = maas.get_sshkeys
+        pkg_repos = maas.get_package_repos
+
+        args[:config][:'user.user-data'] = { 'ssh_authorized_keys' => [] }
+
+        sshkeys.each do |key|
+          args[:config][:'user.user-data']['ssh_authorized_keys'].push(key['key'])
+        end
+
+        pkg_repos.each do |repo|
+          if repo['name'] == 'main_archive'
+            args[:config][:'user.user-data']['apt_mirror'] = repo['url']
+          end
+        end
+
+        args[:config][:"user.user-data"]['maas'] = true
+      end
+
+      # To disable to update apt database on first boot
+      # so chef client can keep doing its job.
+      args[:config][:'user.user-data']['package_update'] = false
+
+      args[:config][:"user.user-data"] = \
+        "#cloud-config\n" + YAML.dump(args[:config][:"user.user-data"])[4..-1]
+
+      return args
+    end
+
+    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']
+
+        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]
+
+      elsif options['ipaddresses']
+        options[:ifaces] = check_ip_available(options['ipaddresses'], maas, logger)
+        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.") \
+          unless options[:ifaces][0]['gateway_ip']
+
+        args[:config][:'user.network-config'] = {
+          'version' => 1,
+          'config' => [
+            {
+              'type' => 'nameserver',
+              'address' => options[:ifaces][0]['dns_servers'][0]
+            }
+          ]
+        }
+
+        # to generate configuration for [:config][:'user.network-config']['config']
+        options[:ifaces].each_with_index do |iface,index|
+          if index == 0
             iface_conf = {
               'type' => 'physical',
               'name' => "eth#{index}",
@@ -88,120 +121,102 @@ module Gogetit
                   'type' => 'static',
                   'ipv4' => true,
                   'address' => iface['ip'] + '/' + iface['cidr'].split('/')[1],
+                  'gateway' => iface['gateway_ip'],
                   'mtu' => iface['vlan']['mtu'],
                   'control' => 'auto'
                 }
               ]
             }
-          elsif ifaces[0]['vlan']['name'] == 'untagged'
-            iface_conf = {
-              'type' => 'vlan',
-              'name' => "eth0.#{iface['vlan']['vid'].to_s}",
-              'vlan_id' => iface['vlan']['vid'].to_s,
-              'vlan_link' => 'eth0',
-              'subnets' => [
-                {
-                  'type' => 'static',
-                  'ipv4' => true,
-                  'address' => iface['ip'] + '/' + iface['cidr'].split('/')[1],
-                  'mtu' => iface['vlan']['mtu'],
-                  'control' => 'auto'
-                }
-              ]
-            }
+          elsif index > 0
+            if options[:ifaces][0]['vlan']['name'] != 'untagged'
+              iface_conf = {
+                'type' => 'physical',
+                'name' => "eth#{index}",
+                'subnets' => [
+                  {
+                    'type' => 'static',
+                    'ipv4' => true,
+                    'address' => iface['ip'] + '/' + iface['cidr'].split('/')[1],
+                    'mtu' => iface['vlan']['mtu'],
+                    'control' => 'auto'
+                  }
+                ]
+              }
+            elsif options[:ifaces][0]['vlan']['name'] == 'untagged'
+              iface_conf = {
+                'type' => 'vlan',
+                'name' => "eth0.#{iface['vlan']['vid'].to_s}",
+                'vlan_id' => iface['vlan']['vid'].to_s,
+                'vlan_link' => 'eth0',
+                'subnets' => [
+                  {
+                    'type' => 'static',
+                    'ipv4' => true,
+                    'address' => iface['ip'] + '/' + iface['cidr'].split('/')[1],
+                    'mtu' => iface['vlan']['mtu'],
+                    'control' => 'auto'
+                  }
+                ]
+              }
+            end
           end
+
+          args[:config][:'user.network-config']['config'].push(iface_conf)
         end
 
-        args[:config][:'user.network-config']['config'].push(iface_conf)
+        args[:config][:"user.network-config"] = \
+          YAML.dump(args[:config][:"user.network-config"])[4..-1]
       end
 
-      args[:config][:"user.network-config"] = \
-        YAML.dump(args[:config][:"user.network-config"])[4..-1]
+      return args
+    end
 
-      # To configure devices
-      ifaces.each_with_index do |iface,index|
-        if index == 0
-          if iface['vlan']['name'] == 'untagged' # or vid == 0
-            args[:devices][:"eth#{index}"] = {
-              mtu: iface['vlan']['mtu'].to_s,   #This must be string
-              name: "eth#{index}",
-              nictype: 'bridged',
-              parent: config[:default][:native_bridge],
-              type: 'nic'
-            }
-          elsif iface['vlan']['name'] != 'untagged' # or vid != 0
+    # To configure devices
+    def generate_devices(args, options)
+      args[:devices] = {}
+
+      if options['no-maas']
+        args[:devices] = \
+          YAML.load_file(options['file'])[:devices]
+
+      elsif options['ipaddresses']
+        options[:ifaces].each_with_index do |iface,index|
+          if index == 0
+            if iface['vlan']['name'] == 'untagged' # or vid == 0
+              args[:devices][:"eth#{index}"] = {
+                mtu: iface['vlan']['mtu'].to_s,   #This must be string
+                name: "eth#{index}",
+                nictype: 'bridged',
+                parent: config[:default][:root_bridge],
+                type: 'nic'
+              }
+            elsif iface['vlan']['name'] != 'untagged' # or vid != 0
+              args[:devices][:"eth#{index}"] = {
+                mtu: iface['vlan']['mtu'].to_s,   #This must be string
+                name: "eth#{index}",
+                nictype: 'bridged',
+                parent: config[:default][:root_bridge] + "-" + iface['vlan']['vid'].to_s,
+                type: 'nic'
+              }
+            end
+          # When options[:ifaces][0]['vlan']['name'] == 'untagged' and index > 0,
+          # it does not need to generate more devices 
+          # since it will configure the IPs with tagged VLANs.
+          elsif options[:ifaces][0]['vlan']['name'] != 'untagged'
             args[:devices][:"eth#{index}"] = {
               mtu: iface['vlan']['mtu'].to_s,   #This must be string
               name: "eth#{index}",
               nictype: 'bridged',
-              parent: config[:default][:native_bridge] + "-" + iface['vlan']['vid'].to_s,
+              parent: config[:default][:root_bridge] + "-" + iface['vlan']['vid'].to_s,
               type: 'nic'
             }
           end
-        # When ifaces[0]['vlan']['name'] == 'untagged' and index > 0,
-        # it does not need to generate more devices 
-        # since it will configure the IPs with tagged VLANs.
-        elsif ifaces[0]['vlan']['name'] != 'untagged'
-          args[:devices][:"eth#{index}"] = {
-            mtu: iface['vlan']['mtu'].to_s,   #This must be string
-            name: "eth#{index}",
-            nictype: 'bridged',
-            parent: config[:default][:native_bridge] + "-" + iface['vlan']['vid'].to_s,
-            type: 'nic'
-          }
         end
-      end
-
-      return args
-    end
-
-    def generate_common_args
-      logger.info("Calling <#{__method__.to_s}>")
-      args = {}
-      sshkeys = maas.get_sshkeys
-      pkg_repos = maas.get_package_repos
-
-      args[:config] = {
-        'user.user-data': { 'ssh_authorized_keys' => [] }
-      }
-
-      sshkeys.each do |key|
-        args[:config][:'user.user-data']['ssh_authorized_keys'].push(key['key'])
-      end
-
-      # To disable to update apt database on first boot
-      # so chef client can keep doing its job.
-      args[:config][:'user.user-data']['package_update'] = false
-
-      pkg_repos.each do |repo|
-        if repo['name'] == 'main_archive'
-          args[:config][:'user.user-data']['apt_mirror'] = repo['url']
-        end
-      end
-
-      args[:config][:"user.user-data"] = \
-        YAML.dump(args[:config][:"user.user-data"])[4..-1]
-
-      args[:config][:"user.user-data"] = "#cloud-config\n" + args[:config][:"user.user-data"]
-      return args
-    end
-
-    def create(name, options = {})
-      logger.info("Calling <#{__method__.to_s}>")
-      abort("Container or Hostname #{name} already exists!") \
-        if container_exists?(name) or maas.domain_name_exists?(name)
-
-      args = generate_common_args
-
-      if options['ipaddresses']
-        args = generate_args(args, options)
-      elsif options[:vlans]
-        #check_vlan_available(options[:vlans])
       else
-        abort("native_bridge #{config[:default][:native_bridge]} does not exist.") \
-           unless conn.networks.include? config[:default][:native_bridge]
+        abort("root_bridge #{config[:default][:root_bridge]} does not exist.") \
+           unless conn.networks.include? config[:default][:root_bridge]
 
-        native_bridge_mtu = nil
+        root_bridge_mtu = nil
         # It assumes you only use one fabric as of now,
         # since there might be more fabrics with each untagged vlans on them,
         # which might make finding exact mtu fail as following process.
@@ -209,21 +224,72 @@ module Gogetit
 
         maas.get_subnets.each do |subnet|
           if subnet['vlan']['name'] == 'untagged' and subnet['vlan']['fabric'] == default_fabric
-            native_bridge_mtu = subnet['vlan']['mtu']
+            root_bridge_mtu = subnet['vlan']['mtu']
             break
           end
         end
 
         args[:devices] = {}
         args[:devices][:"eth0"] = {
-          mtu: native_bridge_mtu.to_s,   #This must be string
+          mtu: root_bridge_mtu.to_s,   #This must be string
           name: 'eth0',
           nictype: 'bridged',
-          parent: config[:default][:native_bridge],
+          parent: config[:default][:root_bridge],
           type: 'nic'
         }
       end
 
+      return args
+    end
+
+    def reserve_ips(name, options, container)
+      # Generate params to reserve IPs
+      options[:ifaces].each_with_index do |iface,index|
+        if index == 0
+          params = {
+            'subnet' => iface['cidr'],
+            'ip' => iface['ip'],
+            'hostname' => name,
+            'mac' => container[:expanded_config][:"volatile.eth#{index}.hwaddr"]
+          }
+        elsif index > 0
+          # if dot, '.', is used as a conjunction instead of '-',
+          # it fails ocuring '404 not found'.
+          # if under score, '_', is used as a conjunction instead of '-',
+          # it breaks MAAS DNS somehow..
+          if options[:ifaces][0]['vlan']['name'] == 'untagged'
+            params = {
+              'subnet' => iface['cidr'],
+              'ip' => iface['ip'],
+              'hostname' => 'eth0' + '-' + iface['vlan']['vid'].to_s  + '-' + name,
+              'mac' => container[:expanded_config][:"volatile.eth0.hwaddr"]
+            }
+          elsif options[:ifaces][0]['vlan']['name'] != 'untagged'
+            params = {
+              'subnet' => iface['cidr'],
+              'ip' => iface['ip'],
+              'hostname' => "eth#{index}" + '-' + name,
+              'mac' => container[:expanded_config][:"volatile.eth#{index}.hwaddr"]
+            }
+          end
+        end
+        maas.ipaddresses('reserve', params)
+      end
+    end
+
+    def create(name, options = {})
+      logger.info("Calling <#{__method__.to_s}>")
+
+      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']
+
+      args = generate_user_data(args, options)
+      args = generate_network_config(args, options)
+      args = generate_devices(args, options)
+
       args[:alias] ||= config[:lxd][:default_alias]
       args[:sync] ||= true
 
@@ -235,46 +301,28 @@ module Gogetit
       # Fetch container object again
       container = conn.container(name)
 
-      if options['vlans'] or options['ipaddresses']
-        # Generate params to reserve IPs
-        args[:ifaces].each_with_index do |iface,index|
-          if index == 0
-            params = {
-              'subnet' => iface['cidr'],
-              'ip' => iface['ip'],
-              'hostname' => name,
-              'mac' => container[:expanded_config][:"volatile.eth#{index}.hwaddr"]
-            }
-          elsif index > 0
-            # if dot, '.', is used as a conjunction instead of '-',
-            # it fails ocuring '404 not found'.
-            # if under score, '_', is used as a conjunction instead of '-',
-            # it breaks MAAS DNS somehow..
-            if args[:ifaces][0]['vlan']['name'] == 'untagged'
-              params = {
-                'subnet' => iface['cidr'],
-                'ip' => iface['ip'],
-                'hostname' => 'eth0' + '-' + iface['vlan']['vid'].to_s  + '-' + name,
-                'mac' => container[:expanded_config][:"volatile.eth0.hwaddr"]
-              }
-            elsif args[:ifaces][0]['vlan']['name'] != 'untagged'
-              params = {
-                'subnet' => iface['cidr'],
-                'ip' => iface['ip'],
-                'hostname' => "eth#{index}" + '-' + name,
-                'mac' => container[:expanded_config][:"volatile.eth#{index}.hwaddr"]
-              }
-            end
-          end
-          maas.ipaddresses('reserve', params)
-        end
-      end
+      reserve_ips(name, options, container) \
+        if options['vlans'] or options['ipaddresses'] \
+          unless options['no-maas']
 
       conn.start_container(name, :sync=>"true")
 
-      fqdn = name + '.' + maas.get_domain
-      wait_until_available(fqdn, logger)
+      if options['no-maas']
+        ip_or_fqdn = options['ip_to_access']
+      else
+        ip_or_fqdn = name + '.' + maas.get_domain
+      end
+
+      wait_until_available(ip_or_fqdn, logger)
       logger.info("#{name} has been created.")
+
+      config[:default][:user] ||= ENV['USER']
+      if options['no-maas']
+        puts "ssh #{config[:default][:user]}@#{options['ip_to_access']}"
+      else
+        puts "ssh #{config[:default][:user]}@#{name}"
+      end
+
       true
     end
 
@@ -289,31 +337,36 @@ module Gogetit
       end
 
       wait_until_state(name, 'Stopped')
-      conn.delete_container(name, args)
 
-      if container[:config][:"user.network-config"]
-        net_conf = YAML.load(
-          container[:config][:"user.network-config"]
-        )['config']
-        # To remove DNS configuration
-        net_conf.shift
-
-        net_conf.each do |nic|
-          if nic['subnets'][0]['type'] == 'static'
-            # It assumes we only assign a single subnet on a VLAN.
-            # Subnets in a VLAN, VLANs in a Fabric
-            ip = nic['subnets'][0]['address'].split('/')[0]
-
-            if maas.ipaddresses_reserved?(ip)
-              maas.ipaddresses('release', { 'ip' => ip })
+      if YAML.load(container[:config][:"user.user-data"])['maas']
+        logger.info("This is a MAAS enabled container.")
+        if container[:config][:"user.network-config"]
+          net_conf = YAML.load(
+            container[:config][:"user.network-config"]
+          )['config']
+          # To remove DNS configuration
+          net_conf.shift
+
+          net_conf.each do |nic|
+            if nic['subnets'][0]['type'] == 'static'
+              # It assumes we only assign a single subnet on a VLAN.
+              # Subnets in a VLAN, VLANs in a Fabric
+              ip = nic['subnets'][0]['address'].split('/')[0]
+
+              if maas.ipaddresses_reserved?(ip)
+                maas.ipaddresses('release', { 'ip' => ip })
+              end
             end
           end
         end
+
+        maas.delete_dns_record(name)
       end
 
+      conn.delete_container(name, args)
+
       # When multiple static IPs were reserved, it will not delete anything
       # since they are deleted when releasing the IPs above.
-      maas.delete_dns_record(name)
       logger.info("#{name} has been destroyed.")
       true
     end

data/lib/sample_conf/gogetit.yml

@@ -1,6 +1,6 @@
 default:
   user: ubuntu
-  native_bridge: my_favorite_bridge
+  root_bridge: $root_bridge
 # etcd:
 #   url: http://etcd.example.com:2379
 # about MAAS

data/lib/sample_conf/lxd_without_maas.yml

@@ -0,0 +1,56 @@
+---
+:config:
+  :user.network-config:
+    version: 1
+    config:
+    - type: nameserver
+      address: $maas_ip
+    - type: physical
+      name: eth0
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.112.10/24
+        gateway: 192.168.112.1
+        mtu: 8954
+        control: auto
+    - type: physical
+      name: eth1
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.113.10/24
+        mtu: 8954
+        control: auto
+    - type: physical
+      name: eth2
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.114.10/24
+        mtu: 8954
+        control: auto
+  user.user-data:
+    ssh_authorized_keys:
+    - ssh-rsa blahblah someone1@somewhere1
+    - ssh-rsa blahblah someone2@somewhere2
+  apt_mirror: http://kr.archive.ubuntu.com/ubuntu
+:devices:
+  eth0:
+    mtu: "8954"
+    name: eth0
+    nictype: bridged
+    parent: $root_bridge-112
+    type: nic
+  eth1:
+    mtu: "8954"
+    name: eth1
+    nictype: bridged
+    parent: $root_bridge-113
+    type: nic
+  eth2:
+    mtu: "8954"
+    name: eth2
+    nictype: bridged
+    parent: $root_bridge-114
+    type: nic

data/lib/sample_conf/lxd_without_maas_vlans.yml

@@ -0,0 +1,48 @@
+---
+:config:
+  :user.network-config:
+    version: 1
+    config:
+    - type: nameserver
+      address: $maas_ip
+    - type: physical
+      name: eth0
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.111.10/24
+        gateway: 192.168.111.1
+        mtu: 8954
+        control: auto
+    - type: vlan
+      name: eth0.112
+      vlan_id: '112'
+      vlan_link: eth0
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.112.10/24
+        mtu: 8954
+        control: auto
+    - type: vlan
+      name: eth0.113
+      vlan_id: '113'
+      vlan_link: eth0
+      subnets:
+      - type: static
+        ipv4: true
+        address: 192.168.113.10/24
+        mtu: 8954
+        control: auto
+  user.user-data:
+    ssh_authorized_keys:
+      - ssh-rsa blahblahblah someone1@somewhere1
+      - ssh-rsa blahblahblah someone2@somewhere2
+    apt_mirror: http://kr.archive.ubuntu.com/ubuntu
+:devices:
+  :eth0:
+    :mtu: '8954'
+    :name: eth0
+    :nictype: bridged
+    :parent: $root_bridge
+    :type: nic

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,6 +217,8 @@ files:
 - lib/providers/lxd.rb
 - lib/sample_conf/gogetit.yml
 - lib/sample_conf/lxd_profile.yml
+- lib/sample_conf/lxd_without_maas.yml
+- lib/sample_conf/lxd_without_maas_vlans.yml
 - lib/template/disk.xml
 - lib/template/domain.xml
 - lib/template/nic.xml