Make web servers at Bytemark use grisu as the fileserver

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 68d85c079dc0d24bea0487558cbcd361ec252d2c..5058ffb2a7514ab266a404ce56e0fc4b0ae5eb8a 100644 (file)
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -11,3 +11,4 @@ depends           "git"
 depends           "memcached"
 depends           "nodejs"
 depends           "tools"
 depends           "memcached"
 depends           "nodejs"
 depends           "tools"

+depends           "nfs"

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 2258b3f8417697b5baaef71bf22d280498278d4d..374c970b42dd06c23ec002c52c2b973ef7319b06 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -17,6 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.set[:nfs]["/store/rails"] = {
+  :host => node[:web][:fileserver],
+  :path => "/store/rails"
+}
+
+include_recipe "nfs"
+

 directory node[:web][:base_directory] do
   group "rails"
   mode 02775
 directory node[:web][:base_directory] do
   group "rails"
   mode 02775

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 6bcffb79a760ab8a257b7df3b38a42f778076b14..ff4e45acef242084f6a2f81c9aeeeba41e8b14df 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -27,7 +27,8 @@ default_attributes(
     }
   },
   :web => {
     }
   },
   :web => {

-    :backends => %w(rails4 rails5)
+    :backends => %w(rails4 rails5),
+    :fileserver => "grisu"

   }
 )
 
   }
 )
 

diff --git a/roles/ic.rb b/roles/ic.rb
index 16ff9ca485942b234d35f8511c73a8f5edcb88cc..e33c34895439fd960bbcbaf07af3e308c9ea28f2 100644 (file)
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -30,7 +30,8 @@ default_attributes(
     }
   },
   :web => {
     }
   },
   :web => {

-    :backends => %w(rails1 rails2 rails3)
+    :backends => %w(rails1 rails2 rails3),
+    :fileserver => "ironbelly"

   }
 )
 
   }
 )
 

diff --git a/roles/web.rb b/roles/web.rb
index 69b6a45d24bded98f47930d13a7c88f7825a540b..26e1734947a0885da17a89f86bc32c8fc35818cc 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -10,9 +10,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
-  },

   :passenger => {
     :pool_idle_time => 0
   },
   :passenger => {
     :pool_idle_time => 0
   },


@@ -22,7 +19,3 @@ default_attributes(
     :readonly_database_host => "db-slave"
   }
 )
     :readonly_database_host => "db-slave"
   }
 )

-
-run_list(
-  "recipe[nfs]"
-)