Bump kitchen-dokken from 2.10.0 to 2.11.0

[chef.git] / cookbooks / web / recipes / backend.rb

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 97bab57c70ff57b294a305d1b2495ce5434a57f6..871f692d955be5794c3d30a194108e2e24d36bb0 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:memcached][:ip_address] = node.internal_ipaddress
+

 include_recipe "memcached"
 include_recipe "apache"
 include_recipe "web::rails"
 include_recipe "memcached"
 include_recipe "apache"
 include_recipe "web::rails"


@@ -40,20 +42,10 @@ apache_site "www.openstreetmap.org" do
             :secret_key_base => web_passwords["secret_key_base"]
 end
 
             :secret_key_base => web_passwords["secret_key_base"]
 end
 

-node.normal[:memcached][:ip_address] = node.internal_ipaddress
-

 service "rails-jobs@storage" do
 service "rails-jobs@storage" do

-  action [:enable, :start]
-  supports :restart => true
-  subscribes :restart, "rails_port[www.openstreetmap.org]"
-  subscribes :restart, "systemd_service[rails-jobs]"
+  action [:disable, :stop]

 end
 
 end
 

-if node[:web][:primary_cluster]
-  service "rails-jobs@traces" do
-    action [:enable, :start]
-    supports :restart => true
-    subscribes :restart, "rails_port[www.openstreetmap.org]"
-    subscribes :restart, "systemd_service[rails-jobs]"
-  end
+service "rails-jobs@traces" do
+  action [:disable, :stop]

 end
 end