Merge pull request #113 from engineyard/FB-830-env-vars-memcached

[FB-830] Enable memcached recipe with EY_MEMCACHED_ENABLED
engineyard · Sep 2, 2019 · a2d173f · a2d173f
2 parents 80bfe47 + 85090f1
commit a2d173f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/cookbooks/ey-base/metadata.rb b/cookbooks/ey-base/metadata.rb
@@ -28,3 +28,4 @@
 
 # custom recipes
 depends 'redis'
+depends 'memcached'
diff --git a/cookbooks/ey-base/recipes/custom.rb b/cookbooks/ey-base/recipes/custom.rb
@@ -1,3 +1,7 @@
 if fetch_env_var(node, "EY_REDIS_ENABLED") =~ /^TRUE$/i
   include_recipe 'redis'
 end
+
+if fetch_env_var(node, "EY_MEMCACHED_ENABLED") =~ /^TRUE$/i
+  include_recipe 'memcached'
+end
diff --git a/cookbooks/memcached/attributes/default.rb b/cookbooks/memcached/attributes/default.rb
@@ -21,9 +21,10 @@
   # Install memcached on a utility instance named 'memcached'
   #memcached['install_type'] = 'NAMED_UTILS'
   memcached['utility_name'] = 'memcached'
+  memcached['install_type'] = 'NAMED_UTILS'
 
   # Install memcached on all app instances, or on a solo instance
-  memcached['install_type'] = 'ALL_APP_INSTANCES'
+  # memcached['install_type'] = 'ALL_APP_INSTANCES'
 
   # Amount of memory in MB to be used by memcached
   memcached['memusage'] = 1024

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
@@ -4,7 +4,5 @@
 # Recipe:: default
 #
 
-if node['memcached']['perform_install']
-  include_recipe "memcached::install"
-  include_recipe "memcached::configure"
-end
+include_recipe "memcached::install"
+include_recipe "memcached::configure"