dev-lxc 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80dd5ce814277d70504316af75ab5a801489356a
-  data.tar.gz: 62c7bb81010529e775615c8e31da47b1360686c4
+  metadata.gz: 380d44e7d8a00e55126697a912e6137dfa5fdd07
+  data.tar.gz: 51efc2c299e10e4ebd8df1e8ac2f0407ce122c72
 SHA512:
-  metadata.gz: b4ce050e1637a22d0dc990560ebf43b39527600bdacf6a048b01a37e8aa45505c327255f59c45f4829576d07c45ea8cf74dd15497e243a638cc90d71eec91c69
-  data.tar.gz: 62b58c1d3956bed13dd7c08a819ac73abaced1cf76e8c7dbe82f055bd3af2e485523b62dfeac5e8f6816b1b79d9d810f2d55cf9131c1cffb87da9acc546ca36f
+  metadata.gz: cb04423d93d681ea9830d5b11bb5ed3c4cbbc9f1dc5e9c3f85d91683b5110c0fa1d630a7bb8dfb9dbe9e26a0ced508c6675c9369405c122a4cce8e0cb733d28d
+  data.tar.gz: f7ad42408a5123e111f622ba7c138af98c9e3c00d05e6b627aed85a8cde85e0ac35d49c673c3a5f203bc5922c1c02c4cdacccd270a1310088537d18f26648ae5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # dev-lxc Change Log
 
+## 2.3.1 (2016-11-28)
+
+* Create DevLXC::Cluster.abort_up to help with code clarity
+* Shutdown container gracefully instead of doing a hard stop
+* Skip container start if it is already running
+* Refactor DevLXC.assign_ip_address to DevLXC::Server.assign_static_ip_address
+* Change DevLXC::Server.deregister_from_dhcp to DevLXC::Server.remove_static_ip_address
+* Remove dhcp release post-stop hook since it is not the most reliable solution
+* Remove lingering DHCP IP addresses before starting a server
+* Remove lingering DHCP IP addresses after destroying or shutting down a server
+* Comment out data_collector config in a node's client.rb
+* Add a clarifying comment to DevLXC::Cluster.up
+
 ## 2.3.0 (2016-11-22)
 
 * Create DNS records for all servers before starting a server

data/lib/dev-lxc/cli.rb

@@ -343,7 +343,7 @@ nodes:
       print_elapsed_time(Time.now - start_time)
     end
 
-    desc "halt [SERVER_NAME_REGEX]", "Stop servers"
+    desc "halt [SERVER_NAME_REGEX]", "Shutdown servers"
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     def halt(server_name_regex=nil)
       start_time = Time.now

data/lib/dev-lxc/cluster.rb

@@ -315,7 +315,7 @@ module DevLXC
 
     def halt(server_name_regex=nil)
       servers = get_sorted_servers(server_name_regex)
-      servers.reverse_each { |s| s.stop; puts }
+      servers.reverse_each { |s| s.shutdown; puts }
       delete_dns_records unless get_sorted_servers.any? { |s| s.container.state != :stopped }
     end
 
@@ -325,9 +325,68 @@ module DevLXC
     end
 
     def up(server_name_regex=nil)
-      abort_up = false
       configured_servers = Array.new
       servers = get_sorted_servers(server_name_regex)
+      exit 1 if abort_up(servers)
+      prep_product_cache(servers)
+      servers.each do |server|
+        clone_from_base_container(server) unless server.container.defined?
+      end
+      # get_sorted_servers is called again in order to ensure the container objects are initialized properly in case they were just cloned from the base container
+      servers = get_sorted_servers(server_name_regex)
+      create_dns_records unless servers.empty?
+      servers.each do |server|
+        if %w(build-nodes runners).include?(@server_configs[server.name][:server_type])
+          next if @server_configs[server.name][:required_products]["chefdk"] && @server_configs[server.name][:required_products].length == 1
+        end
+        install_products(server) unless @server_configs[server.name][:required_products].empty?
+      end
+      servers.each do |server|
+        if server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
+          if server.name == @config["chef-backend"][:bootstrap_frontend]
+            running_backends = Array.new
+            @config["chef-backend"][:backends].reverse_each do |server_name|
+              backend = get_server(server_name)
+              if backend.container.defined? && backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: backend cluster configured but frontend not bootstrapped") }.empty?
+                if backend.container.running?
+                  running_backends << backend.name
+                  backend.shutdown
+                end
+                backend.snapshot("dev-lxc build: backend cluster configured but frontend not bootstrapped")
+                snapshot = backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.first
+                backend.snapshot_destroy(snapshot.first) if snapshot
+              end
+            end
+            @config["chef-backend"][:backends].each do |server_name|
+              if running_backends.include?(server_name)
+                get_server(server_name).start
+                configured_servers << server_name unless configured_servers.include?(server_name)
+              end
+            end
+          end
+          configure_products(server)
+          configured_servers << server.name
+        end
+        if server.container.running?
+          puts "Container '#{server.name}' is already running"
+          puts
+        else
+          server.start
+        end
+      end
+      configured_servers.reverse_each do |server_name|
+        server = get_server(server_name)
+        server.shutdown if server.container.running?
+        server.snapshot("dev-lxc build: completed")
+      end
+      configured_servers.each do |server_name|
+        server = get_server(server_name)
+        server.start if server.container.defined?
+      end
+    end
+
+    def abort_up(servers)
+      abort_up = false
       servers.each do |server|
         next if server.container.defined?
         if (@config['chef-server'][:frontends] && @config['chef-server'][:frontends].include?(server.name)) || server.name == @config['analytics'][:bootstrap_backend]
@@ -424,56 +483,7 @@ module DevLXC
           end
         end
       end
-      exit 1 if abort_up
-      prep_product_cache(servers)
-      servers.each do |server|
-        clone_from_base_container(server) unless server.container.defined?
-      end
-      servers = get_sorted_servers(server_name_regex)
-      create_dns_records unless servers.empty?
-      servers.each do |server|
-        if %w(build-nodes runners).include?(@server_configs[server.name][:server_type])
-          next if @server_configs[server.name][:required_products]["chefdk"] && @server_configs[server.name][:required_products].length == 1
-        end
-        install_products(server) unless @server_configs[server.name][:required_products].empty?
-      end
-      servers.each do |server|
-        if server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
-          if server.name == @config["chef-backend"][:bootstrap_frontend]
-            running_backends = Array.new
-            @config["chef-backend"][:backends].reverse_each do |server_name|
-              backend = get_server(server_name)
-              if backend.container.defined? && backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: backend cluster configured but frontend not bootstrapped") }.empty?
-                if backend.container.running?
-                  running_backends << backend.name
-                  backend.stop
-                end
-                backend.snapshot("dev-lxc build: backend cluster configured but frontend not bootstrapped")
-                snapshot = backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.first
-                backend.snapshot_destroy(snapshot.first) if snapshot
-              end
-            end
-            @config["chef-backend"][:backends].each do |server_name|
-              if running_backends.include?(server_name)
-                get_server(server_name).start
-                configured_servers << server_name unless configured_servers.include?(server_name)
-              end
-            end
-          end
-          configure_products(server)
-          configured_servers << server.name
-        end
-        server.start unless server.container.running?
-      end
-      configured_servers.reverse_each do |server_name|
-        server = get_server(server_name)
-        server.stop if server.container.running?
-        server.snapshot("dev-lxc build: completed")
-      end
-      configured_servers.each do |server_name|
-        server = get_server(server_name)
-        server.start if server.container.defined?
-      end
+      return abort_up
     end
 
     def create_dns_records
@@ -498,9 +508,6 @@ module DevLXC
       server.container.load_config
       puts "Deleting SSH Server Host Keys"
       FileUtils.rm_f(Dir.glob("#{server.container.config_item('lxc.rootfs')}/etc/ssh/ssh_host*_key*"))
-      puts "Adding lxc.hook.post-stop hook"
-      server.container.set_config_item("lxc.hook.post-stop", "/usr/local/share/lxc/hooks/post-stop-dhcp-release")
-      server.container.save_config
     end
 
     def get_product_download_info(server, product_name, product_options)
@@ -605,14 +612,14 @@ module DevLXC
         next if %w(build-nodes runners).include?(@server_configs[server.name][:server_type]) && product_name == "chefdk"
         server.install_package(package_source)
       end
-      server.stop
+      server.shutdown
       server.snapshot("dev-lxc build: products installed")
       server.start if server_was_running
     end
 
     def configure_products(server)
       puts "Configuring container '#{server.name}'"
-      server.start unless server.container.running?
+      server.start
       required_products = @server_configs[server.name][:required_products].keys if @server_configs[server.name][:required_products]
       required_products ||= Array.new
       server_type = @server_configs[server.name][:server_type]
@@ -770,8 +777,8 @@ ssl_verify_mode :verify_none
       automate_server_name = @server_configs.select {|name, config| config[:server_type] == 'automate'}.keys.first
       if automate_server_name
         client_rb += %Q(
-data_collector.server_url "https://#{automate_server_name}/data-collector/v0/"
-data_collector.token "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"
+# data_collector.server_url "https://#{automate_server_name}/data-collector/v0/"
+# data_collector.token "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"
 )
       end
 

data/lib/dev-lxc/container.rb

@@ -31,14 +31,14 @@ module DevLXC
       end
     end
 
-    def stop
-      puts "Stopping container '#{self.name}'"
+    def shutdown
+      puts "Shutting down container '#{self.name}'"
       super
-      wait("STOPPED", 3)
+      wait(:stopped, 3)
     end
 
     def destroy
-      stop if running?
+      shutdown if running?
       puts "Destroying container '#{self.name}'"
       super if self.defined?
     end

data/lib/dev-lxc/server.rb

@@ -35,18 +35,21 @@ module DevLXC
     end
 
     def start
+      return if @container.running?
       hwaddr = @container.config_item("lxc.network.0.hwaddr")
-      DevLXC.assign_ip_address(@ipaddress, @container.name, hwaddr) if @ipaddress
+      release_lingering_dhcp_ip_addresses(hwaddr)
+      assign_static_ip_address(hwaddr) if @ipaddress
       @container.sync_mounts(@mounts)
       @container.start
       @container.sync_ssh_keys(@ssh_keys)
       puts
     end
 
-    def stop
+    def shutdown
       hwaddr = @container.config_item("lxc.network.0.hwaddr") if @container.defined?
-      @container.stop
-      deregister_from_dhcp(hwaddr)
+      @container.shutdown
+      remove_static_ip_address(hwaddr)
+      release_lingering_dhcp_ip_addresses(hwaddr)
     end
 
     def snapshot(comment=nil)
@@ -145,10 +148,38 @@ module DevLXC
         @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
       end
       @container.destroy
-      deregister_from_dhcp(hwaddr)
+      remove_static_ip_address(hwaddr)
+      release_lingering_dhcp_ip_addresses(hwaddr)
     end
 
-    def deregister_from_dhcp(hwaddr)
+    def release_lingering_dhcp_ip_addresses(hwaddr)
+      dhcp_leases = IO.readlines('/var/lib/misc/dnsmasq.lxcbr0.leases')
+      dhcp_leases.each do |dhcp_lease|
+        if m = dhcp_lease.match(/ #{hwaddr} (\d+\.\d+\.\d+\.\d+) /)
+          mac_addr = hwaddr
+          ip_addr = m[1]
+        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) #{@ipaddress} /)
+          mac_addr = m[1]
+          ip_addr = @ipaddress
+        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) (\d+\.\d+\.\d+\.\d+) #{@container.name.sub(/\.lxc$/, '')} /)
+          mac_addr = m[1]
+          ip_addr = m[2]
+        end
+        if mac_addr && ip_addr
+          puts "Releasing lingering DHCP lease: #{dhcp_lease}"
+          system("dhcp_release lxcbr0 #{ip_addr} #{mac_addr}")
+        end
+      end
+    end
+
+    def assign_static_ip_address(hwaddr)
+      puts "Assigning IP address #{@ipaddress} to '#{@container.name}' container's lxc.network.hwaddr #{hwaddr}"
+      DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /(^#{hwaddr}|,#{@ipaddress}$)/)
+      DevLXC.append_line_to_file("/etc/lxc/dhcp-hosts.conf", "#{hwaddr},#{@ipaddress}\n")
+      DevLXC.reload_dnsmasq
+    end
+
+    def remove_static_ip_address(hwaddr)
       if @ipaddress
         DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /,#{@ipaddress}$/)
       end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/lib/dev-lxc.rb

@@ -93,17 +93,10 @@ module DevLXC
 
     IO.write("#{base_container.config_item('lxc.rootfs')}/etc/sudoers.d/dev-lxc", "dev-lxc   ALL=NOPASSWD:ALL\n")
     FileUtils.chmod(0440, "#{base_container.config_item('lxc.rootfs')}/etc/sudoers.d/dev-lxc")
-    base_container.stop
+    base_container.shutdown
     return base_container
   end
 
-  def self.assign_ip_address(ipaddress, container_name, hwaddr)
-    puts "Assigning IP address #{ipaddress} to '#{container_name}' container's lxc.network.hwaddr #{hwaddr}"
-    search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /(^#{hwaddr}|,#{ipaddress}$)/)
-    append_line_to_file("/etc/lxc/dhcp-hosts.conf", "#{hwaddr},#{ipaddress}\n")
-    reload_dnsmasq
-  end
-
   def self.reload_dnsmasq
     system("pkill -HUP dnsmasq")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler