Skip to content
Snippets Groups Projects

Resolve L2SS-218 "Move existing tooling to bootstrap dir"

Merged Resolve L2SS-218 "Move existing tooling to bootstrap dir"
L2SS-218-move_existing_tooling_to_bootstrap_dir into master
Merged Thomas Juerges requested to merge L2SS-218-move_existing_tooling_to_bootstrap_dir into master
Viewing commit 14e93148
Prev
Show latest version
1 file
+ 7
− 5
Compare changes
  • Side-by-side
  • Inline
  • 14e93148
    Thomas Juerges
    L2SS-218. Taking Jan David's recommendation in to account · 14e93148
    Thomas Juerges authored 
    - Replace the set +e/set -e with || true when loading the Tango DB.
- Explain why in the world I am starting dsconfig twice.
bootstrap/sbin/rebuild_system_from_scratch.sh
+ 7
− 5
@@ -55,8 +55,12 @@ function start_minimal_tango()
{
(cd ${HOME_DIR}/docker-compose
make minimal
# There is an issue with the dsconfig container that it every
# other time just exits without telling why.
# Therefore start dsconfig, then wait for 10s to allow it
# to die and just start it again.
# Don't they say that the second time is always a charm?
make start dsconfig
# Just for good measure, wait a moment and start dsconfig again
echo -e "\tWaiting for dsconfig to settle down..."
sleep 10
echo -e "\tDone.\n\tStarting dsconfig again."
@@ -65,10 +69,8 @@ function start_minimal_tango()
function configure_tango_db()
{
# This somehow returns with a non-0 return code.
set +e
${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json
set -e
# This somehow returns with a non-0 return code, make Bash happy.
${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json || true
}
function configure_elk()