summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtestsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh56
-rw-r--r--testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp2
-rw-r--r--utils/dashboard/process_data.py1
3 files changed, 51 insertions, 8 deletions
diff --git a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
index 12dc17a6..25ead251 100755
--- a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
+++ b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
@@ -50,6 +50,8 @@ webservers_arr=
appservers_arr=
dbservers_arr=
all_agents_arr=
+hostname_arr=
+hostip_arr=
# Other variables used in this script
class_nodes=
@@ -60,16 +62,53 @@ read_conf() {
if [ ${#line} -gt 0 ] && [ ${line:0:1} != "#" ] && [ ${line:0:1} != "[" ];then
line=(${line//=/ })
case ${line[0]} in
+ "controller" )
+ e_arr=(${line[1]//:/ })
+ controller_host=${e_arr[0]}
+ controller_ip=${e_arr[2]}
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[2]}");;
"client_servers" )
- client_servers=${line[1]};;
+ elems=(${line[1]//,/ })
+ for e in "${elems[@]}";do
+ e_arr=(${e//:/ })
+ client_servers=${client_servers}${e_arr[0]}","
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[1]}")
+ done
+ client_servers=${client_servers%,};;
"web_servers" )
- web_servers=${line[1]};;
+ e_arr=(${line[1]//:/ })
+ web_servers=${web_servers}${e_arr[0]}","
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[1]}")
+ web_servers=${e_arr[0]};;
"app_servers" )
- app_servers=${line[1]};;
+ elems=(${line[1]//,/ })
+ for e in "${elems[@]}";do
+ e_arr=(${e//:/ })
+ app_servers=${app_servers}${e_arr[0]}","
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[1]}")
+ done
+ app_servers=${app_servers%,};;
"cjdbc_controller" )
- cjdbc_controller=${line[1]};;
- "database_servers" )
- database_servers=${line[1]};;
+ if [ "x"${line[1]} != "x" ]; then
+ e_arr=(${line[1]//:/ })
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[1]}")
+ cjdbc_controller=${e_arr[0]}
+ fi
+ ;;
+ "db_servers" )
+ elems=(${line[1]//,/ })
+ for e in "${elems[@]}";do
+ e_arr=(${e//:/ })
+ database_servers=${database_servers}${e_arr[0]}","
+ hostname_arr=("${hostname_arr[@]}" "${e_arr[0]}")
+ hostip_arr=("${hostip_arr[@]}" "${e_arr[1]}")
+ done
+ database_servers=${database_servers%,};;
"database_port" )
database_port=${line[1]};;
"db_username" )
@@ -102,6 +141,11 @@ read_conf() {
fi
echo "-------------Main conf info:----------"
+ i=1
+ while [ $i -lt ${#hostname_arr[@]} ]; do
+ echo ${hostip_arr[$i]}" "${hostname_arr[$i]}
+ let i=i+1
+ done
echo "clients_arr: "${clients_arr[@]}
echo "bench_client: "$bench_client
echo "remote_client_servers: "$remote_client_servers
diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp
index 252293b9..cddbe34d 100644
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp
+++ b/testsuites/rubbos/puppet_manifests/modules/rubbos_httpd/manifests/rubbos_httpd_on.pp
@@ -131,7 +131,7 @@ class rubbos_httpd::rubbos_httpd_on {
ensure => present,
path => "${rubbos_app_tools}/apache2/conf/workers.properties",
source => "puppet:///modules/rubbos_httpd/apache_conf/workers.properties",
- show_diff => present,
+ show_diff => false,
subscribe => [Exec['make install httpd'],Exec['make install mod jk']],
}
diff --git a/utils/dashboard/process_data.py b/utils/dashboard/process_data.py
index d511a08d..d4b2ccfb 100644
--- a/utils/dashboard/process_data.py
+++ b/utils/dashboard/process_data.py
@@ -44,7 +44,6 @@ def main():
i = 1
params = dict()
while (i < len(sys.argv)):
- print sys.argv[i]
if sys.argv[i]=="-i" or sys.argv[i]=="--input":
params["input"] = sys.argv[i+1]
if sys.argv[i]=="-s" or sys.argv[i]=="--suite":