kitchen-habitat 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f5bd09f9be9941cb4fbb5854d6e190133ac755
-  data.tar.gz: d282775cb109380519f3163f053f3586afa4db62
+  metadata.gz: b6694587068b88af9d3ed639a257adcfd517f875
+  data.tar.gz: b91653665f443ee506cc0b54126c3f4d3ec5aba0
 SHA512:
-  metadata.gz: 5697def2efc706d739ae06182d8b430e623405a5e0e488817a8c8f076ea84075d81e52d88606ad5ff6ecf64e7e18205067bfac90556b2502081293ef8aac76b0
-  data.tar.gz: 70a4508a072c3f752082be170ec8d8d1db45c4357ed51edefc99bbcfe6cba0d2e1511190e5c0ee34f6db3e15a192699bf4cf4c667945220daca9c741aa4a86cc
+  metadata.gz: 4dc477c2e3f31d2390606aa4fa51492f3f713ab9aeed36e14066543c71bf3484eb99e8c3802f874e111e9080892e9655a49ec1c362bc68e0643748e09ddcdc9f
+  data.tar.gz: a83287c2bdc77cb43991062d6424e0598a9d9a92f1d2499fbdd0580efb4885bb16c76cf59e75f4ca3053b058349a453405938dace84a2237837099be9ad9557c

data/README.md

@@ -42,6 +42,9 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `hab_sup_listen_gossip`
   * Port for the supervisor's gossip communication
   * Defaults to `nil`
+* `hab_sup_group`
+  * Service group for the supervisor to belong do.
+  * Default is `default`
 
 ### Package Settings
 
@@ -66,9 +69,15 @@ You'll need the test-kitchen & kitchen-habitat gems installed in your system, al
 * `package_timestamp`
   * Package timestamp of the package to be run.
   * Defaults to `nil` or if `artifact_name` is supplied, the `package_timestamp` will be parsed from the filename of the hart file.
+* `service_topology`
+  * The topology for the service to run in.  Valid values are `nil`, `standalone`, `leader`
+  * Defaults to `nil` which is `standalone`
+* `service_update_strategy`
+  * Describes how package updates are to be applied.  Valid values are `nil`, `at-once`, `rolling`.
+  * Default is `nil`, which does not check for package updates.
 * `config_directory`
   * Directory containing a user.toml or/and a default.toml, hooks, and configuration files to be passed to the service under test.
-  * Default to `nil`
+  * Defaults to `nil`
 * `override_package_config`
   * Tell the supervisor to the the configuration files and hooks from `config_directory` instead of what was packaged with the service.  (Uses `--config-from` via the `hab-sup` CLI.)
 * `user_toml_name`

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.2.4".freeze
+    VERSION = "0.3.0".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -28,6 +28,7 @@ module Kitchen
       default_config :hab_sup_listen_gossip, nil
       default_config :hab_sup_peer, []
       default_config :hab_sup_bind, []
+      default_config :hab_sup_group, nil
 
       # hab-sup service options
       default_config :artifact_name, nil
@@ -37,6 +38,9 @@ module Kitchen
       end
       default_config :package_version, nil
       default_config :package_timestamp, nil
+      default_config :service_topology, nil
+      default_config :service_update_strategy, nil
+
 
       # local stuffs to copy
       default_config :results_directory, nil
@@ -145,7 +149,7 @@ module Kitchen
         else
           <<-RUN
           [ -f ./run.pid ] && rm -f run.pid
-          [ -f ./nohup.out ] && rm -f nohup.out 
+          [ -f ./nohup.out ] && rm -f nohup.out
           nohup sudo hab-sup start #{package_ident} #{supervisor_options} & echo $! > run.pid
           sleep 5
           [ -f ./nohup.out ] && cat nohup.out || (echo "Failed to start the supervisor." && exit 1)
@@ -246,12 +250,16 @@ module Kitchen
       end
 
       def supervisor_options
-        options = "#{'--listen-gossip ' + config[:hab_sup_listen_gossip] unless config[:hab_sup_listen_gossip].nil?} "  \
-        "#{'--listen-http ' + config[:hab_sup_listen_http] unless config[:hab_sup_listen_http].nil?} "  \
-        "#{'--config-from ' + File.join(config[:root_path], 'config/') if config[:override_package_config]} "
-        options.strip!
+        options = "" 
+        options += " --listen-gossip #{config[:hab_sup_listen_gossip]}" unless config[:hab_sup_listen_gossip].nil?
+        options += " --listen-http #{config[:hab_sup_listen_http]}" unless config[:hab_sup_listen_http].nil?}
+        options += " --config-from #{File.join(config[:root_path], 'config/')}" if config[:override_package_config]}
         options += config[:hab_sup_bind].map { |b| " --bind #{b}" }.join(" ") if config[:hab_sup_bind].any?
         options += config[:hab_sup_peer].map { |p| " --peer #{p}" }.join(" ") if config[:hab_sup_peer].any?
+        options += " --group #{config[:hab_sup_group]}" unless config[:hab_sup_group].nil?
+        options += " --topology #{config[:service_topology]}" unless config[:service_topology].nil?
+        options += " --strategy #{config[:service_update_strategy]}" unless config[:service_update_strategy].nil?
+
         options
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Murawski