summaryrefslogtreecommitdiff
path: root/lib/chef/knife/bootstrap
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-09-02 13:40:06 +0100
committerThom May <thom@may.lt>2015-09-02 13:40:06 +0100
commitb86ba5b0858676da98e0456d340ac2f1a031a0d1 (patch)
tree2764c4238aa13f872c029ef9b71facf14d9f3574 /lib/chef/knife/bootstrap
parente42eaec8f13babcc5553db631ee9cdadade89294 (diff)
parentf6835a4f5af4a380d7e35e32ddd8c3a0fe7f2ac3 (diff)
downloadchef-b86ba5b0858676da98e0456d340ac2f1a031a0d1.tar.gz
Merge pull request #3190 from swalberg/tag_nodes_on_bootstrap
Allow tags to be set on a node during bootstrap
Diffstat (limited to 'lib/chef/knife/bootstrap')
-rw-r--r--lib/chef/knife/bootstrap/client_builder.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef/knife/bootstrap/client_builder.rb b/lib/chef/knife/bootstrap/client_builder.rb
index 304b06b8b7..59b0cabd49 100644
--- a/lib/chef/knife/bootstrap/client_builder.rb
+++ b/lib/chef/knife/bootstrap/client_builder.rb
@@ -141,6 +141,9 @@ class Chef
node.run_list(normalized_run_list)
node.normal_attrs = first_boot_attributes if first_boot_attributes
node.environment(environment) if environment
+ (knife_config[:tags] || []).each do |tag|
+ node.tags << tag
+ end
node
end
end