From 200db90dab874804f986cf5801ec253b8fbfd0a8 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Fri, 23 Nov 2018 14:21:02 +0000
Subject: [PATCH] added configurable clmc service network dependency through
environment variable
---
scripts/clmc-service/install-clmc-service.sh | 4 ++--
scripts/clmc-service/install.sh | 5 +++++
scripts/test/fixture.sh | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/scripts/clmc-service/install-clmc-service.sh b/scripts/clmc-service/install-clmc-service.sh
index ff396fc..d2d45d5 100755
--- a/scripts/clmc-service/install-clmc-service.sh
+++ b/scripts/clmc-service/install-clmc-service.sh
@@ -112,8 +112,8 @@ chmod 755 $start_script_file
file="/lib/systemd/system/flameclmc.service"
echo "[Unit]" > $file
echo "Description=flameclmc" >> $file
-echo "After=flame-fqdn-registration.service" >> $file
-echo "Requires=flame-fqdn-registration.service" >> $file
+echo "After=${NETWORK_DEPENDENCY}" >> $file
+echo "Requires=${NETWORK_DEPENDENCY}" >> $file
echo "" >> $file
echo "[Service]" >> $file
echo "Type=forking" >> $file
diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh
index e3e0591..973e67e 100755
--- a/scripts/clmc-service/install.sh
+++ b/scripts/clmc-service/install.sh
@@ -32,6 +32,11 @@ if [[ -z "${SFEMC_FQDN}" ]]; then
exit 1
fi
+if [[ -z "${NETWORK_DEPENDENCY}" ]]; then
+ echo "Failed: cannot find NETWORK_DEPENDENCY environment variable."
+ exit 1
+fi
+
# Ensure everything runs in directory of the parent script
cd `dirname $0`
diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh
index 72f3de4..a716574 100755
--- a/scripts/test/fixture.sh
+++ b/scripts/test/fixture.sh
@@ -53,7 +53,7 @@ create() {
if [ ${service_name} == "clmc-service" ]; then
cmd="${target_root}/scripts/clmc-service/install.sh"
echo "Provisioning command ${cmd}"
- lxc exec ${service_name} --env REPO_ROOT=${target_root} --env SFEMC_FQDN="sfemc.localhost" -- ${cmd}
+ lxc exec ${service_name} --env REPO_ROOT=${target_root} --env SFEMC_FQDN="sfemc.localhost" --env NETWORK_DEPENDENCY="network.target"-- ${cmd}
exit_code=$?
if [ $exit_code != 0 ]; then
echo "clmc-service installation failed with exit code ${exit_code}"
--
GitLab