Don't try to mount EBS volumes if they are not available.

Grantoo · Nov 26, 2014 · ff867ff · ff867ff
1 parent e03e9cb
commit ff867ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/opsworks_initial_setup/attributes/default.rb b/opsworks_initial_setup/attributes/default.rb
@@ -62,7 +62,7 @@
 default[:opsworks_initial_setup][:yum_dump_file] = File.join(Chef::CHEF_ROOT, "chef", "provider", "package", "yum-dump.py")
 default[:opsworks_initial_setup][:yum_dump_lock_timeout] = 120
 
-default[:opsworks_initial_setup][:autofs_map_file] = "/etc/auto.opsworks"
+default[:opsworks_initial_setup][:autofs_map_file] = "/etc/auto.opsworks" if infrastructure_class?('ec2')
 
 case node[:platform]
 when 'redhat','centos','fedora','amazon'

diff --git a/opsworks_initial_setup/recipes/default.rb b/opsworks_initial_setup/recipes/default.rb
@@ -5,8 +5,10 @@
 
 include_recipe 'opsworks_initial_setup::sysctl'
 include_recipe 'opsworks_initial_setup::limits'
-include_recipe 'opsworks_initial_setup::bind_mounts'
-include_recipe 'opsworks_initial_setup::vol_mount_point'
+if infrastructure_class?('ec2')
+  include_recipe 'opsworks_initial_setup::bind_mounts'
+  include_recipe 'opsworks_initial_setup::vol_mount_point'
+end
 include_recipe 'opsworks_initial_setup::remove_landscape'
 include_recipe 'opsworks_initial_setup::ldconfig'