Revert "Move instance types data into cfncluster section"

This reverts commit e6d551a

Signed-off-by: ddeidda <[email protected]>

Author: ddeidda

attributes/default.rb

@@ -441,4 +441,4 @@
 default['cfncluster']['is_official_ami_build'] = false
 
 # Additional instance types data
-default['cfncluster']['instance_types_data'] = nil
+default['instance_types_data'] = nil

templates/default/jobwatcher.cfg.erb

@@ -4,4 +4,4 @@ scheduler = <%= node['cfncluster']['cfn_scheduler'] %>
 stack_name = <%= node['cfncluster']['stack_name'] %>
 cfncluster_dir = <%= node['cfncluster']['base_dir'] %>
 proxy = <%= node['cfncluster']['cfn_proxy'] %>
-instance_types_data = <%= node['cfncluster']['instance_types_data'].to_json %>
+instance_types_data = <%= node['instance_types_data'].to_json %>

templates/default/nodewatcher.cfg.erb

@@ -4,4 +4,4 @@ scheduler = <%= node['cfncluster']['cfn_scheduler'] %>
 proxy = <%= node['cfncluster']['cfn_proxy'] %>
 scaledown_idletime = <%= node['cfncluster']['cfn_scaledown_idletime'] %>
 stack_name = <%= node['cfncluster']['stack_name'] %>
-instance_types_data = <%= node['cfncluster']['instance_types_data'].to_json %>
+instance_types_data = <%= node['instance_types_data'].to_json %>

templates/default/sqswatcher.cfg.erb

@@ -6,4 +6,4 @@ scheduler = <%= node['cfncluster']['cfn_scheduler'] %>
 cluster_user = <%= node['cfncluster']['cfn_cluster_user'] %>
 proxy = <%= node['cfncluster']['cfn_proxy'] %>
 stack_name = <%= node['cfncluster']['stack_name'] %>
-instance_types_data = <%= node['cfncluster']['instance_types_data'].to_json %>
+instance_types_data = <%= node['instance_types_data'].to_json %>