dev-lxc 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58108e0d97dc0aa6ce9c46beb31240ec9f30d5c
-  data.tar.gz: 699291d15a022d54b90cbc31069ac15099555cad
+  metadata.gz: 6d9524224ecebf487af039aa0dc080b1d3755e11
+  data.tar.gz: 5ac4b6e2a627b4f3c64768478171eba69406b4bd
 SHA512:
-  metadata.gz: a7e24b0f8733f118903ff96d8885b5c1bb29432d3fa0bb3c94676c475db4047023ecd60ad41da77e688f7c923bb52e5d5c35d7987b3e0b8f537e8318f3ce8e30
-  data.tar.gz: c3758b895fc91a3b764e845dd41ddadb5b95669de2b68cfad93f78180c0918c3169cf009a35941242aba148a414ad513ed7bd160bbcce4e9b0bc9a4c653b9352
+  metadata.gz: fbb54b3db80ee6173bafc556822b734f6405677785c51035c8db11f0d6743baa5538adaa0dd777e3c6d2331e92434aa1c865ddd5ad2a60ecc446c2fcf4a1d955
+  data.tar.gz: 0748667276c932fb63b6744aded788364d24b02eddb250768ca99b79bb318f45417949fe5a4bb2250431702d5181c8961f962bdd5e303079e92e717191d98b6e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # dev-lxc Change Log
 
+## 2.2.2 (2016-07-20)
+
+* Don't calculate/install required products if "build: completed" snapshot exists
+* Be more explicit about skipping install of chefdk on build nodes
+
 ## 2.2.1 (2016-07-20)
 
 * Add --include-products option to show-config command

data/README.md

@@ -32,7 +32,7 @@ If you aren't familiar with using containers please read this introduction.
 
 ### Requirements
 
-* Please follow the [Prerequisite Instructions](docs/prerequisites.md)
+* Please follow the [Prerequisites Instructions](docs/prerequisites.md)
 
 When you are done with the prerequisites you should be able to log into the dev-lxc-platform VM and start using it.
 

data/docs/prerequisites.md

@@ -29,8 +29,6 @@ Configure .kitchen.yml settings such as cpus, memory, synced_folders as desired.
 
 This should take less than 15 minutes.
 
-While the VM is being created you are free to open a separate terminal and follow the remaining setup instructions.
-
 ```
 cd dev-lxc-platform
 kitchen converge
@@ -52,6 +50,12 @@ brew install direnv
 
 Be sure to follow the [direnv install instructions](http://direnv.net/) to add the appropriate line to your user's shell rc file.
 
+Run the following to approve the `.envrc` file
+
+```
+direnv allow
+```
+
 #### Setup Networking
 
 Your workstation needs to know how to resolve the .lxc domain that dev-lxc containers use.

data/lib/dev-lxc/cluster.rb

@@ -395,8 +395,9 @@ module DevLXC
       end
       servers = get_sorted_servers(server_name_regex)
       servers.each do |server|
-        # if this is a build node and it only has one product (chefdk) then skip the install
-        next if @server_configs[server.name][:server_type] == "build-nodes" && @server_configs[server.name][:required_products].length == 1
+        if @server_configs[server.name][:server_type] == "build-nodes"
+          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|
@@ -493,6 +494,9 @@ module DevLXC
         if !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
           # Skipping product cache preparation for container because it has a 'products installed' snapshot
           next
+        elsif !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
+          # Skipping product cache preparation for container because it has a 'build: completed' snapshot
+          next
         end
         products.each do |product_name, product_options|
           if product_options && product_options['package_source']
@@ -531,6 +535,9 @@ module DevLXC
       if !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
         puts "Skipping product installation for container '#{server.name}' because it already has a 'products installed' snapshot"
         return
+      elsif !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
+        puts "Skipping product installation for container '#{server.name}' because it already has a 'build: completed' snapshot"
+        return
       end
       if server.container.running?
         server_was_running = true

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Jeremiah Snapp