Merge branch 'master-chef-11.10' of ssh://git.amazon.com:2222/pkg/Cha…

…rlieCookbooks into master-chef-11.10
BlueHotDog · Mar 14, 2014 · 84e1f11 · 84e1f11
2 parents 3952933 + 6325164
commit 84e1f11
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/opsworks_custom_cookbooks/attributes/default.rb b/opsworks_custom_cookbooks/attributes/default.rb
@@ -20,7 +20,7 @@
 default[:opsworks_custom_cookbooks][:user] = 'root'
 default[:opsworks_custom_cookbooks][:group] = 'root'
 default[:opsworks_custom_cookbooks][:home] = '/root'
-default[:opsworks_custom_cookbooks][:destination] = ChefClientConfigSimpleParser.get_attribute(Chef::Config[:config_file], 'cookbook_path').select{|dir| dir =~ /site-cookbooks/}.first
+normal[:opsworks_custom_cookbooks][:destination] = OpsworksInstanceAgentConfig.get_site_cookbooks_dir
 
 default[:opsworks_custom_cookbooks][:recipes] = []
 

diff --git a/opsworks_custom_cookbooks/libraries/chef_client_config_simple_parser.rb b/opsworks_custom_cookbooks/libraries/chef_client_config_simple_parser.rb
diff --git a/opsworks_custom_cookbooks/libraries/opsworks_instance_agent_config_parser.rb b/opsworks_custom_cookbooks/libraries/opsworks_instance_agent_config_parser.rb
@@ -0,0 +1,8 @@
+module OpsworksInstanceAgentConfig
+  require 'yaml'
+
+  def self.get_site_cookbooks_dir
+    agent_config = YAML.load_file('/etc/aws/opsworks/instance-agent.yml')
+    agent_config[:site_cookbooks_dir]
+  end
+end