Merge pull request oswaldlabs#17 from giorgio-v/chef-tags

Tags from node
jhmartin · Aug 17, 2013 · c133341 · c133341
2 parents ecf4833 + d83373b
commit c133341
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/chef-rundeck.rb b/lib/chef-rundeck.rb
@@ -1,12 +1,12 @@
 #
 # Copyright 2010, Opscode, Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,14 +47,14 @@ def configure
       #++
       os_family = node[:kernel][:os] =~ /windows/i ? 'windows' : 'unix'
       response << <<-EOH
-<node name="#{xml_escape(node[:fqdn])}" 
-      type="Node" 
+<node name="#{xml_escape(node[:fqdn])}"
+      type="Node"
       description="#{xml_escape(node.name)}"
       osArch="#{xml_escape(node[:kernel][:machine])}"
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(node[:platform])}"
       osVersion="#{xml_escape(node[:platform_version])}"
-      tags="#{xml_escape([node.chef_environment, node.run_list.roles.join(',')].join(','))}"
+      tags="#{xml_escape([node.chef_environment, node[:tags].join(','), node.run_list.roles.join(',')].join(','))}"
       username="#{xml_escape(ChefRundeck.username)}"
       hostname="#{xml_escape(node[:fqdn])}"
       editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node.name)}/edit"/>
@@ -64,4 +64,3 @@ def configure
     response
   end
 end
-