dev-lxc 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d3622dc2cfc2449d736e692894efcf01e38dea
-  data.tar.gz: f10be9851cc3d1d2c15babe6fc9198916da6da0c
+  metadata.gz: c4d56770910d2c693b886f65c3b233d8aeca752a
+  data.tar.gz: b0e22969f25e6e3def0807322f5041ca51482bb8
 SHA512:
-  metadata.gz: 85143d71647be27a0bbd80639561988b42c7e05ce4c4df58ae9498813fcddfeb099976a0cba4c5f6860fdbe8062572865a3a72e6ff47bc1ef872a2703169fcad
-  data.tar.gz: cf90cd2fcf4303422cee16f5a927e8d63a73ae3df96dc9a634476aab685211ccda1573e6db9b3499d3b320ca7bbf633fcdd649628ec6ca29a0becec0dc2d2898
+  metadata.gz: b216fc333e7b71c654ae83ee247169be68cdb75dd072bb72f2e0bcf5e1a8f4fa66d1ebfcb26647ac80af92720d352c7cd6d880fd5f9560ba94c913b229b02946
+  data.tar.gz: 2520dc769f5320ec1fecf416ad0b223d0553c0f1b44591288e5efac1e860e0258534ddd0097d1bbd71a4d0ae824f98bab8e9b21db7caf44654693b04d5be64da

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # dev-lxc Change Log
 
+## 2.4.0 (2017-02-03)
+
+* Refactor DHCP address management
+* Add enable_build_snapshots config option
+* Skip abort test if server exists AND "build: completed" snapshot exists
+* Add auto-integration of Compliance and standalone Chef Server
+* Remove period from sha256sum error message
+* Reword message when base container already exists
+* Update prerequisites.md
+
 ## 2.3.3 (2016-12-19)
 
 * Remove debug output from "dpkg -i"

data/docs/configuration.md

@@ -14,6 +14,10 @@ dev-lxc init --chef --automate --supermarket --runners --nodes > dev-lxc.yml
 The contents of `dev-lxc.yml` should look like this.
 
 ```
+# enable_build_snapshots automatically makes container snapshots at key times during the build process
+# default value is `true`
+#enable_build_snapshots: true
+
 # base_container must be the name of an existing container
 base_container: b-ubuntu-1404
 
@@ -92,7 +96,7 @@ As you can see there are four server types represented by five servers.
 
 #### Global Settings
 
-The global settings used by each of the server types are the `base_container`, a list of `mounts` and
+The global settings used by each of the server types are `enable_build_snapshots`, the `base_container`, a list of `mounts` and
 a list of `ssh-keys`. These settings are described in the config comments.
 
 Be sure to set `base_container` in the `dev-lxc.yml` to an existing container's name.  
@@ -102,7 +106,7 @@ If you don't already have a container to use as a `base_container` then you can
 
 #### Server Specific Settings
 
-It is possible to define different values for `base_container`, `mounts` or `ssh-keys` for a particular server type or even for a particular server as you can see in the following snippet.
+It is possible to define different values for `enable_build_snapshots`, `base_container`, `mounts` or `ssh-keys` for a particular server type or even for a particular server as you can see in the following snippet.
 
 ```
 nodes:

data/docs/prerequisites.md

@@ -11,7 +11,9 @@ Install the vagrant-persistent-storage plugin.
 vagrant plugin install vagrant-persistent-storage
 ```
 
-Download and install [ChefDK](http://downloads.chef.io/chef-dk/).
+Download and install [ChefDK](http://downloads.chef.io/).
+
+Run `chef shell-init` to read its usage docs. Then run the appropriate command for your shell.
 
 #### Download dev-lxc-platform
 

data/lib/dev-lxc.rb

@@ -9,7 +9,7 @@ module DevLXC
   def self.create_base_container(base_container_name, base_container_options)
     base_container = DevLXC::Container.new(base_container_name)
     if base_container.defined?
-      puts "Using existing base container '#{base_container.name}'"
+      puts "Base container '#{base_container.name}' already exists"
       return base_container
     end
     puts "Creating base container '#{base_container.name}'"

data/lib/dev-lxc/cli.rb

@@ -60,7 +60,11 @@ module DevLXC::CLI
     option :append, :aliases => "-a", :type => :boolean, :desc => "Do not generate the global config header"
     option :filename, :aliases => "-f", :desc => "Write generated content to FILE rather than standard output."
     def init
-      header = %Q(# base_container must be the name of an existing container
+      header = %Q(# enable_build_snapshots automatically makes container snapshots at key times during the build process
+# default value is `true`
+#enable_build_snapshots: true
+
+# base_container must be the name of an existing container
 base_container: b-ubuntu-1404
 
 # list any host directories you want mounted into the servers

data/lib/dev-lxc/cluster.rb

@@ -21,6 +21,11 @@ module DevLXC
               products = server_config['products']
               products ||= Hash.new
 
+              enable_build_snapshots = cluster_config[server_type]["enable_build_snapshots"]
+              enable_build_snapshots = cluster_config["enable_build_snapshots"] if enable_build_snapshots.nil?
+              enable_build_snapshots = server_config["enable_build_snapshots"] if server_config.key?("enable_build_snapshots")
+              enable_build_snapshots = true if enable_build_snapshots.nil?
+
               mounts = ["/var/dev-lxc var/dev-lxc"]
               if cluster_config[server_type]["mounts"]
                 mounts.concat(cluster_config[server_type]["mounts"])
@@ -42,6 +47,8 @@ module DevLXC
                 products: products,
                 ipaddress: server_config['ipaddress'],
                 additional_fqdn: nil,
+                enable_build_snapshots: enable_build_snapshots,
+                first_run: false,
                 mounts: mounts,
                 ssh_keys: ssh_keys,
                 base_container_name: base_container_name
@@ -318,14 +325,18 @@ module DevLXC
       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?
+        unless server.container.defined?
+          clone_from_base_container(server)
+          @server_configs[server.name][:first_run] = true
+        end
       end
+      prep_product_cache(servers)
       # 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|
+        next if ! @server_configs[server.name][:enable_build_snapshots] && ! @server_configs[server.name][:first_run]
         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
@@ -336,6 +347,7 @@ module DevLXC
           if server.name == @config["chef-backend"][:bootstrap_frontend]
             running_backends = Array.new
             @config["chef-backend"][:backends].reverse_each do |server_name|
+              next unless @server_configs[server_name][:enable_build_snapshots]
               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?
@@ -348,14 +360,17 @@ module DevLXC
               end
             end
             @config["chef-backend"][:backends].each do |server_name|
+              next unless @server_configs[server_name][:enable_build_snapshots]
               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
+          if @server_configs[server.name][:enable_build_snapshots] || @server_configs[server.name][:first_run]
+            configure_products(server)
+            configured_servers << server.name
+          end
         end
         if server.container.running?
           puts "Container '#{server.name}' is already running"
@@ -365,11 +380,13 @@ module DevLXC
         end
       end
       configured_servers.reverse_each do |server_name|
+        next unless @server_configs[server_name][:enable_build_snapshots]
         server = get_server(server_name)
         server.shutdown if server.container.running?
         server.snapshot("dev-lxc build: completed")
       end
       configured_servers.each do |server_name|
+        next unless @server_configs[server_name][:enable_build_snapshots]
         server = get_server(server_name)
         server.start if server.container.defined?
       end
@@ -378,7 +395,17 @@ module DevLXC
     def abort_up(servers)
       abort_up = false
       servers.each do |server|
-        next if server.container.defined?
+        next if server.container.defined? && !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
+        next if ! @server_configs[server.name][:enable_build_snapshots] && ! @server_configs[server.name][:first_run]
+        if @server_configs[server.name][:server_type] == 'compliance' && @config["chef-server"][:topology] == "standalone"
+          if @config['chef-server'][:bootstrap_backend].nil?
+            puts "ERROR: '#{server.name}' requires a Chef Server bootstrap backend to be configured first."
+            abort_up = true
+          elsif !get_server(@config['chef-server'][:bootstrap_backend]).container.running? && servers.select { |s| s.name == @config['chef-server'][:bootstrap_backend] }.empty?
+            puts "ERROR: '#{server.name}' requires '#{@config['chef-server'][:bootstrap_backend]}' to be running first."
+            abort_up = true
+          end
+        end
         if (@config['chef-server'][:frontends] && @config['chef-server'][:frontends].include?(server.name)) || server.name == @config['analytics'][:bootstrap_backend]
           if @config['chef-server'][:bootstrap_backend].nil?
             puts "ERROR: '#{server.name}' requires a Chef Server bootstrap backend to be configured first."
@@ -545,6 +572,9 @@ module DevLXC
         elsif !force && !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
           # Skipping product cache preparation for container because it has a 'build: completed' snapshot
           next
+        elsif ! @server_configs[server.name][:enable_build_snapshots] && ! @server_configs[server.name][:first_run]
+          # Skipping product cache preparation for container because it build snapshots are disabled and this is not the container's first run
+          next
         end
         products.each do |product_name, product_options|
           if product_options && product_options['package_source']
@@ -574,7 +604,7 @@ module DevLXC
             open(package_source) { |url| File.open(product_cache_path, 'wb') { |f| f.write(url.read) } }
           end
           if package_sha256 != Digest::SHA256.file(product_cache_path).hexdigest
-            puts "ERROR: Incorrect SHA256 for #{product_cache_path}."
+            puts "ERROR: Incorrect SHA256 for #{product_cache_path}"
             exit 1
           end
         elsif !File.exist?(package_source)
@@ -602,9 +632,11 @@ 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.shutdown
-      server.snapshot("dev-lxc build: products installed")
-      server.start if server_was_running
+      if @server_configs[server.name][:enable_build_snapshots]
+        server.shutdown
+        server.snapshot("dev-lxc build: products installed")
+        server.start if server_was_running
+      end
     end
 
     def configure_products(server)
@@ -894,6 +926,31 @@ ssl_verify_mode :verify_none
         server.run_command("chef-compliance-ctl user-create #{admin_user} #{admin_user}")
         server.run_command("chef-compliance-ctl restart core")
       end
+
+      if @config["chef-server"][:topology] == "standalone"
+        chef_server = get_server(@config['chef-server'][:bootstrap_backend])
+        FileUtils.mkdir_p("#{chef_server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server")
+        FileUtils.mkdir_p("#{server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server")
+        IO.write("#{server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/prepare-chef-compliance",
+                 "chef-compliance-ctl connect chef-server --non-interactive true --chef-app-id 'compliance_server' --auth-id 'Chef Server' --insecure true --compliance-url 'https://#{server.name}'"
+                )
+        server.run_command("bash /root/integrate-compliance-with-chef-server/prepare-chef-compliance", "#{server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/prepare-chef-compliance-output")
+        server.run_command("chef-compliance-ctl reconfigure")
+        server.run_command("chef-compliance-ctl restart core")
+        prepare_chef_compliance_output = IO.read("#{server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/prepare-chef-compliance-output")
+        delimited_chef_server_command = prepare_chef_compliance_output.match(/\n---\n(.+)\n---/m)
+        if delimited_chef_server_command
+          IO.write("#{chef_server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/configure-chef-server", delimited_chef_server_command[1])
+          chef_server.run_command("bash /root/integrate-compliance-with-chef-server/configure-chef-server", "#{chef_server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/configure-chef-server-output")
+        end
+        configure_chef_server_output = IO.read("#{chef_server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/configure-chef-server-output")
+        compliance_command = configure_chef_server_output.match(/^chef-compliance-ctl .+$/)
+        if compliance_command
+          IO.write("#{server.container.config_item('lxc.rootfs')}/root/integrate-compliance-with-chef-server/configure-chef-compliance", compliance_command)
+          server.run_command("bash /root/integrate-compliance-with-chef-server/configure-chef-compliance")
+          server.run_command("chef-compliance-ctl reconfigure")
+        end
+      end
     end
 
     def configure_supermarket(server)

data/lib/dev-lxc/server.rb

@@ -47,10 +47,8 @@ module DevLXC
     end
 
     def shutdown
-      hwaddr = @container.config_item("lxc.network.0.hwaddr") if @container.defined?
-      @container.shutdown
-      remove_static_ip_address(hwaddr)
-      release_lingering_dhcp_ip_addresses(hwaddr)
+      @container.shutdown if @container.running?
+      remove_static_ip_address(@container.config_item("lxc.network.0.hwaddr")) if @container.defined?
     end
 
     def snapshot(comment=nil)
@@ -144,18 +142,16 @@ module DevLXC
     end
 
     def destroy
-      if @container.defined?
-        hwaddr = @container.config_item("lxc.network.0.hwaddr")
-        @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
-      end
+      return unless @container.defined?
+      @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
+      hwaddr = @container.config_item("lxc.network.0.hwaddr")
       @container.destroy
       remove_static_ip_address(hwaddr)
-      release_lingering_dhcp_ip_addresses(hwaddr)
     end
 
     def release_lingering_dhcp_ip_addresses(hwaddr)
       dhcp_leases = IO.readlines('/var/lib/misc/dnsmasq.lxcbr0.leases')
-      dhcp_leases.each do |dhcp_lease|
+      leases_to_release = dhcp_leases.map do |dhcp_lease|
         if m = dhcp_lease.match(/ #{hwaddr} (\d+\.\d+\.\d+\.\d+) /)
           mac_addr = hwaddr
           ip_addr = m[1]
@@ -167,10 +163,18 @@ module DevLXC
           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}")
+          { dhcp_lease: dhcp_lease, mac_addr: mac_addr, ip_addr: ip_addr }
         end
       end
+      leases_to_release.compact!
+      unless leases_to_release.empty?
+        system("systemctl stop lxc-net.service")
+        leases_to_release.each do |l|
+          puts "Releasing lingering DHCP lease: #{l[:dhcp_lease]}"
+          DevLXC.search_file_delete_line("/var/lib/misc/dnsmasq.lxcbr0.leases", /( #{l[:mac_addr]} #{l[:ip_addr]} )/)
+        end
+        system("systemctl start lxc-net.service")
+      end
     end
 
     def assign_static_ip_address(hwaddr)
@@ -180,14 +184,11 @@ module DevLXC
       DevLXC.reload_dnsmasq
     end
 
-    def remove_static_ip_address(hwaddr)
-      if @ipaddress
-        DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /,#{@ipaddress}$/)
-      end
-      unless hwaddr.nil?
+    def remove_static_ip_address(hwaddr=nil)
+      if hwaddr
         DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /^#{hwaddr}/)
+        DevLXC.reload_dnsmasq
       end
-      DevLXC.reload_dnsmasq
     end
 
   end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.3.3"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler