deleted: files/default/node-config.sh

new file: node.json.erb modified: recipes/node.rb
ramonskie · Oct 4, 2013 · 390127b · 390127b
1 parent 3e0600b
commit 390127b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 92 deletions.
diff --git a/files/default/node-config.sh b/files/default/node-config.sh
diff --git a/node.json.erb b/node.json.erb
@@ -0,0 +1,40 @@
+{
+    "capabilities":
+        [
+            {
+                "browserName": "firefox",
+                "version": "<%= @ffversion %>",
+                "maxInstances": <%= @ffmaxinstances %>,
+                "seleniumProtocol": "WebDriver",
+                "platform": "LINUX"
+            },
+            {
+                "browserName": "opera",
+                "version": "<%= @operaversion %>",
+                "maxInstances": <%= @operamaxinstances %>,
+                "seleniumProtocol": "WebDriver",
+                "platform": "LINUX"
+            },
+            {
+                "browserName": "chrome",
+                "version": "<%= @chromeversion %>",
+                "maxInstances": <%= @chromemaxinstances %>,
+                "seleniumProtocol": "WebDriver",
+                "platform": "LINUX"
+            },
+            {
+                "browserName": "htmlunit",
+                "version": "<%= @htmlunitversion %>",
+                "maxInstances": <%= @htmlunitmaxinstances %>,
+                "seleniumProtocol": "WebDriver",
+                "platform": "LINUX"
+            },
+        ],
+    "configuration":
+        {
+            "proxy": "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
+            "maxSession": 5,
+            "register": true,
+            "registerCycle": 5000
+        }
+}
diff --git a/recipes/node.rb b/recipes/node.rb
@@ -1,14 +1,18 @@
 include_recipe "selenium::default"
 package "xvfb"
 
-cookbook_file "/usr/local/bin/node-config.sh" do
-  source "node-config.sh"
-  owner "root"
-  mode "0755"
-end
-
-execute "/usr/local/bin/node-config.sh #{File.join(node['selenium']['server']['confpath'], 'node.json')}" do
-  action :run
+template "/etc/selenium/node.json" do
+ source "node.json.erb"
+   mode 0644
+   variables ({
+   :ffversion => "#{node['selenium']['firefox']['version']}",
+   :ffmaxinstances => "#{node['selenium']['firefox']['maxInstances']}",
+   :operaversion => "#{node['selenium']['opera']['version']}",
+   :operamaxinstances => "#{node['selenium']['opera']['maxInstances']}",
+   :chromeversion => "#{node['selenium']['chrome']['version']}",
+   :chromemaxinstances => "#{node['selenium']['chrome']['maxInstances']}",
+   :htmlunitversion => "#{node['selenium']['htmlunit']['version']}",
+   :htmlunitmaxinstances => "#{node['selenium']['htmlunit']['maxInstances']}"})
 end
 
 template "/etc/init/selenium-node.conf" do