lib/chef/knife/topo_cookbook_create.rb in knife-topo-0.0.3 vs lib/chef/knife/topo_cookbook_create.rb in knife-topo-0.0.4

@@ -148,26 +148,24 @@
               end
             end
           end
           
           # Print out qualified attributes
-          def print_qualified_attr(file, qualifier, qualifier_hash)
-            qualifier_hash.each do |qualifier_value, qualified_attrs|
-              file.puts "if node['topo']['#{qualifier}'] == \"#{qualifier_value}\""
-              print_priority_attrs(file, qualified_attrs, 2)
-              file.puts "end"
-            end
+          def print_qualified_attr(file, qualifier_hash)
+            file.puts "if node['topo']['#{qualifier_hash['qualifier']}'] == \"#{qualifier_hash['value']}\""
+            print_priority_attrs(file, qualifier_hash, 2)
+            file.puts "end"
           end
           
           # Process the attributes not needing qualification
           print_priority_attrs(file, attrs)
           file.puts
           
-          # Process attributes that need to be qualified (must appear after the above in cookbook)
-          %w(node_type).each do |qualifier|
-            if attrs[qualifier]
-              file.puts "# Attributes for specific #{qualifier}"
-              print_qualified_attr(file, qualifier, attrs[qualifier])
+          # Process attributes that need to be qualified
+          if attrs['conditional']
+            attrs['conditional'].each do |qualified_attrs|
+              file.puts "# Attributes for specific #{qualified_attrs['qualifier']}"
+              print_qualified_attr(file, qualified_attrs)
             end
           end        
           
         end
       end
\ No newline at end of file