knife-zero 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c14d86c9f5ba40c4758f6bc7553e0e3f299533f
-  data.tar.gz: 049fcba1509a56553e1547c0d2dc98d8854db324
+  metadata.gz: 03d111ff54381aa4b04054cb4361f8f8e7e5d015
+  data.tar.gz: a3bbc9916becca098ac252ebf8829cfd2ebd3020
 SHA512:
-  metadata.gz: e9cd094110b0219b0ed1ba74d854f44e5f6a624d195d202cfa4cdc3f980cde6004ba9d4978384c2f382f835993dcc4d20bbd7644200d3dc1aeb69b41ad55b609
-  data.tar.gz: d24fcd3e46f799d4098bb69407b57119bd3b1c4b1c268d868fb384ff93b0cce9710842c4f1682ec50cbee35f6458cc06fd9656bd2014f0d0ff0d1ebb0b6c2381
+  metadata.gz: abcb2c7552806897a0bf5281c656adc38717eb11c48d912c5a64c5e664e6770e51aa00e7b5826acc169757f8ebdc390263d95603a6aa85cfb6948b114112d2fb
+  data.tar.gz: 3e9d4dc4a096967a205edbf02a2789137cf79748466e23ad8703e8767a243b3c0073854f87e62beb947111b677a5ff49cf27c53d63b9a473888d22e17ddf5c39

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.13.0
+
+- Feature: Support single Policyfile #80
+- Feature: Add new option --appendix-config to zero bootstrap #82
 
 ## v1.12.1
 

data/README.md

@@ -19,6 +19,8 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 - [Knife-Zero Document](https://knife-zero.github.io)
 - [Knife-Zero Document(Ja)](https://knife-zero.github.io/ja/)
 
+- [CHANGELOG](https://github.com/higanworks/knife-zero/blob/master/CHANGELOG.md)
+
 ## Requirements
 
 - Must support AllowTcpForward 

data/lib/chef/knife/zero_bootstrap.rb

@@ -18,6 +18,7 @@ class Chef
       self.options = Bootstrap.options.merge(self.options)
       self.options.delete :node_ssl_verify_mode
       self.options.delete :node_verify_api_cert
+      self.options.delete :policy_group
 
       ## Override to use nil by default. It should be create PR
       option :ssh_user,
@@ -31,6 +32,15 @@ class Chef
         :default => true,
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
+      option :appendix_config,
+        :long => "--appendix-config PATH",
+        :description => "Append lines to end of client.rb on remote node from file.",
+        :proc => lambda { |o| File.read(o) },
+        :default => nil
+
+      ## For support policy_document_databag(old style)
+      self.options[:policy_name][:description] = "Policy name to use (It'll be set as deployment_group=POLICY_NAME-local)"
+
       def run
         ## Command hook before_bootstrap (After launched Chef-Zero)
         if Chef::Config[:knife][:before_bootstrap]
@@ -72,6 +82,15 @@ class Chef
         end
       end
 
+      ## For support policy_document_databag(old style)
+      def validate_options!
+        if policyfile_and_run_list_given?
+          ui.error("Policyfile options and --run-list are exclusive")
+          exit 1
+        end
+        true
+      end
+
       def build_knifezero_attributes_for_node
 ## Return to Pending.
 #         ssh_url = String.new("ssh://")

data/lib/chef/knife/zero_converge.rb

@@ -34,6 +34,12 @@ class Chef
         :default => nil,
         :proc => lambda { |o| o.to_s }
 
+      ## For support policy_document_databag(old style)
+      option :named_run_list,
+        :short        => "-n NAMED_RUN_LIST",
+        :long         => "--named-run-list NAMED_RUN_LIST",
+        :description  => "Use a policyfile's named run list instead of the default run list"
+
       option :client_version,
         :long         => "--client-version [latest|VERSION]",
         :description  => "Up or downgrade omnibus chef-client before converge.",
@@ -56,6 +62,8 @@ class Chef
           ::Knife::Zero::Helper.hook_shell_out!("before_converge", ui, Chef::Config[:knife][:before_converge])
         end
 
+        validate_options!
+
         @name_args = [@name_args[0], start_chef_client]
       end
 
@@ -70,6 +78,28 @@ class Chef
         Chef::Log.info "Remote command: " + s
         s
       end
+
+      ## For support policy_document_databag(old style)
+      def validate_options!
+        if override_and_named_given?
+          ui.error("--override_runlist and --named_run_list are exclusive")
+          exit 1
+        end
+        true
+      end
+      # True if policy_name and run_list are both given
+      def override_and_named_given?
+        override_runlist_given? && named_run_list_given?
+      end
+
+      def override_runlist_given?
+        !config[:run_list].nil? && !config[:run_list].empty?
+      end
+
+      def named_run_list_given?
+        !config[:run_list].nil? && !config[:run_list].empty?
+      end
+
     end
   end
 end

data/lib/knife-zero/core/bootstrap_context.rb

@@ -28,6 +28,20 @@ class Chef
                end
              end
              client_rb << white_lists.join("\n")
+
+             ## For support policy_document_databag(old style)
+             if @config[:policy_name]
+               client_rb << ["\n", "use_policyfile true",
+                             "versioned_cookbooks true",
+                             "policy_document_native_api false",
+                              %Q{deployment_group "#{@config[:policy_name]}-local"}].join("\n")
+             end
+
+             if @config[:appendix_config]
+               client_rb << ["\n## --appendix-config", @config[:appendix_config]].join("\n")
+             end
+
+             client_rb
            end
 
            alias :orig_start_chef start_chef
@@ -49,6 +63,16 @@ class Chef
                orig_start_chef
              end
            end
+
+           ## For support policy_document_databag(old style)
+           alias :orig_first_boot first_boot
+           def first_boot
+             attributes = orig_first_boot
+             if @config[:policy_name]
+               attributes.delete(:run_list)
+             end
+             attributes
+           end
          end
       end
     end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.12.1"
+    VERSION = "1.13.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler