diff --git a/VERSION b/VERSION index 26aaba0..f0bb29e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.0 +1.3.0 diff --git a/resources/bin/rb_configure_custom.sh b/resources/bin/rb_configure_custom.sh index 7de236e..307fc96 100755 --- a/resources/bin/rb_configure_custom.sh +++ b/resources/bin/rb_configure_custom.sh @@ -7,6 +7,7 @@ source $RBLIB/rb_manager_functions.sh ######## # MAIN # ######## +start_script=$(date +%s) # Save init time CHEFORG="redborder" CLIENTNAME=$(hostname -s) @@ -133,5 +134,9 @@ rb_configure_cgroups &>/dev/null echo "Cgroups configured in /sys/fs/cgroup/redborder.slice/" -e_title "Custom Node configured!" +end_script=$(date +%s) # Save finish scrip time +runtime=$((end_script-start_script)) # Calculate duration of script +runtime_min=$(echo "scale=2; $runtime / 60" | bc -l) # Calculate duration of script in minutes + +e_title "Custom Node configured! ($runtime_min minutes)" date > /etc/redborder/cluster-installed.txt diff --git a/resources/bin/rb_configure_leader.sh b/resources/bin/rb_configure_leader.sh index f449039..c10d0b8 100755 --- a/resources/bin/rb_configure_leader.sh +++ b/resources/bin/rb_configure_leader.sh @@ -345,7 +345,7 @@ function configure_leader(){ e_title "Uploading cookbooks" mkdir -p /var/chef/cache/cookbooks/ - listCookbooks="rb-selinux cron zookeeper kafka druid http2k memcached chef-server consul + listCookbooks="rb-common rb-selinux cron zookeeper kafka druid http2k memcached chef-server consul hadoop samza nginx geoip webui snmp mongodb rbmonitor rbscanner f2k logstash pmacct minio postgresql rbdswatcher rbevents-counter rsyslog freeradius rbnmsp n2klocd rbale rbcep k2http rblogstatter rb-arubacentral rbcgroup rb-exporter rb-proxy rb-postfix @@ -432,6 +432,7 @@ function set_external_service_names { ######## # MAIN # ######## +start_script=$(date +%s) # Save init time CHEFUSER="admin" # Chef server admin user CHEFORG="redborder" # Chef org @@ -533,6 +534,11 @@ rb_configure_cgroups &>/dev/null echo "Cgroups configured in /sys/fs/cgroup/redborder.slice/" -e_title "Leader Node configured!" +end_script=$(date +%s) # Save finish scrip time +runtime=$((end_script-start_script)) # Calculate duration of script +runtime_min=$(echo "scale=2; $runtime / 60" | bc -l) # Calculate duration of script in minutes + +e_title "Leader Node configured! ($runtime_min minutes)" date > /etc/redborder/cluster-installed.txt +