From 3a2af5c3cbd675476047fdaff8d553998d2b7a99 Mon Sep 17 00:00:00 2001 From: Dejan Menges Date: Thu, 6 Oct 2016 11:47:07 +0200 Subject: [PATCH 1/2] Adding port as parameter --- manifests/config.pp | 1 + manifests/hub.pp | 2 ++ manifests/node.pp | 2 ++ manifests/params.pp | 1 + templates/init.d/debian.selenium.erb | 2 +- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index fdfa1d4..25136e8 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -9,6 +9,7 @@ $install_root = $selenium::params::install_root, $options = $selenium::params::server_options, $java = $selenium::params::java, + $port = $selenium::params::port, $jar_name = $selenium::jar_name, $classpath = $selenium::params::default_classpath, ) { diff --git a/manifests/hub.pp b/manifests/hub.pp index 75e53aa..90e2ac2 100644 --- a/manifests/hub.pp +++ b/manifests/hub.pp @@ -6,6 +6,7 @@ # class selenium::hub( $options = $selenium::params::hub_options, + $port = $selenium::params::port, $classpath = $selenium::params::default_classpath, ) inherits selenium::params { validate_string($options) @@ -19,6 +20,7 @@ group => $selenium::group, install_root => $selenium::install_root, options => $options, + port => $port, java => $selenium::java, classpath => $classpath, } -> diff --git a/manifests/node.pp b/manifests/node.pp index 41114cd..72aeebe 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -8,6 +8,7 @@ $display = $selenium::params::display, $options = $selenium::params::node_options, $hub = $selenium::params::default_hub, + $port = $selenium::params::port, $classpath = $selenium::params::default_classpath, ) inherits selenium::params { validate_string($display) @@ -26,6 +27,7 @@ group => $selenium::group, install_root => $selenium::install_root, options => $safe_options, + port => $port, java => $selenium::java, classpath => $classpath } -> diff --git a/manifests/params.pp b/manifests/params.pp index 1d34883..981ef84 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,6 +13,7 @@ $server_options = '-Dwebdriver.enable.native.events=1' $hub_options = '-role hub' $node_options = "${server_options} -role node" + $port = '4444' $java = 'java' $version = '2.45.0' $default_hub = 'http://localhost:4444/grid/register' diff --git a/templates/init.d/debian.selenium.erb b/templates/init.d/debian.selenium.erb index 4667d70..b8255d3 100644 --- a/templates/init.d/debian.selenium.erb +++ b/templates/init.d/debian.selenium.erb @@ -28,7 +28,7 @@ SELENIUM_LOG="${SELENIUM_INSTALL_ROOT}/log/${SELENIUM_LOG_NAME}_stdout.log" SELENIUM_ERROR_LOG="${SELENIUM_INSTALL_ROOT}/log/${SELENIUM_LOG_NAME}_stderr.log" SELENIUM_DISPLAY='<%= @display %>' SELENIUM_OPTIONS='<%= @options %>' -HTTP_PORT=4444 +HTTP_PORT=<%= @node_port %> SELENIUM_ARGS="-port $HTTP_PORT" SELENIUM_JAVA='<%= @java %>' SELENIUM_EXEC_COMMAND='<%= @exec_command %>' From 4f94746ddf661a1651dc87b4c5d14ec66a6cde92 Mon Sep 17 00:00:00 2001 From: Dejan Menges Date: Thu, 6 Oct 2016 14:11:58 +0200 Subject: [PATCH 2/2] Renaming port -> default_port --- manifests/config.pp | 2 +- manifests/hub.pp | 2 +- manifests/node.pp | 2 +- manifests/params.pp | 2 +- templates/init.d/debian.selenium.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 25136e8..2786838 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -9,7 +9,7 @@ $install_root = $selenium::params::install_root, $options = $selenium::params::server_options, $java = $selenium::params::java, - $port = $selenium::params::port, + $port = $selenium::params::default_port, $jar_name = $selenium::jar_name, $classpath = $selenium::params::default_classpath, ) { diff --git a/manifests/hub.pp b/manifests/hub.pp index 90e2ac2..b937d25 100644 --- a/manifests/hub.pp +++ b/manifests/hub.pp @@ -6,7 +6,7 @@ # class selenium::hub( $options = $selenium::params::hub_options, - $port = $selenium::params::port, + $port = $selenium::params::default_port, $classpath = $selenium::params::default_classpath, ) inherits selenium::params { validate_string($options) diff --git a/manifests/node.pp b/manifests/node.pp index 72aeebe..7e2b29c 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -8,7 +8,7 @@ $display = $selenium::params::display, $options = $selenium::params::node_options, $hub = $selenium::params::default_hub, - $port = $selenium::params::port, + $port = $selenium::params::default_port, $classpath = $selenium::params::default_classpath, ) inherits selenium::params { validate_string($display) diff --git a/manifests/params.pp b/manifests/params.pp index 981ef84..6986d4b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,7 +13,7 @@ $server_options = '-Dwebdriver.enable.native.events=1' $hub_options = '-role hub' $node_options = "${server_options} -role node" - $port = '4444' + $default_port = '4444' $java = 'java' $version = '2.45.0' $default_hub = 'http://localhost:4444/grid/register' diff --git a/templates/init.d/debian.selenium.erb b/templates/init.d/debian.selenium.erb index b8255d3..05133b6 100644 --- a/templates/init.d/debian.selenium.erb +++ b/templates/init.d/debian.selenium.erb @@ -28,7 +28,7 @@ SELENIUM_LOG="${SELENIUM_INSTALL_ROOT}/log/${SELENIUM_LOG_NAME}_stdout.log" SELENIUM_ERROR_LOG="${SELENIUM_INSTALL_ROOT}/log/${SELENIUM_LOG_NAME}_stderr.log" SELENIUM_DISPLAY='<%= @display %>' SELENIUM_OPTIONS='<%= @options %>' -HTTP_PORT=<%= @node_port %> +HTTP_PORT=<%= @port %> SELENIUM_ARGS="-port $HTTP_PORT" SELENIUM_JAVA='<%= @java %>' SELENIUM_EXEC_COMMAND='<%= @exec_command %>'