Skip to content

Commit fc93748

Browse files
author
root
committed
feat(toolkit-install): add --no-firefly-receiver passthrough flag (v1.0.1)
Passes --no-firefly-receiver through to perfSONAR-install-flowd-go.sh for sites running flowd-go 2.4.x RPM where the fireflyp plugin stanza is not yet supported. Also updates SHA256 and header comment.
1 parent a35597b commit fc93748

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

docs/perfsonar/tools_scripts/perfSONAR-toolkit-install.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
3-
# Version: 1.0.0
3+
# Version: 1.0.1
44
# Author: Shawn McKee, University of Michigan
55
# Acknowledgements: Supported by IRIS-HEP and OSG-LHC
66

@@ -32,6 +32,8 @@ set -euo pipefail
3232
# --dry-run Print steps but do not execute destructive operations
3333
# --no-flowd-go Skip flowd-go (SciTags) installation (installed by default)
3434
# --experiment-id N SciTags experiment ID for flowd-go (1-14; interactive prompt if omitted)
35+
# --no-firefly-receiver Disable fireflyp plugin in flowd-go config (use with flowd-go 2.4.x RPM)
36+
# Requires flowd-go >= 2.5.0; omit with current 2.4.2 RPM to avoid errors
3537
#
3638
# Log:
3739
# /var/log/perfsonar-toolkit-install.log
@@ -42,6 +44,7 @@ AUTO_YES=false
4244
NON_INTERACTIVE=false
4345
INSTALL_FLOWD_GO=true
4446
FLOWD_GO_EXPERIMENT_ID=""
47+
NO_FIREFLY_RECEIVER=false
4548
BUNDLE="toolkit"
4649
LE_FQDN=""
4750
LE_EMAIL=""
@@ -94,8 +97,9 @@ parse_cli() {
9497
--bundle) BUNDLE="${2:-toolkit}"; shift 2;;
9598
--fqdn) LE_FQDN="${2:-}"; shift 2;;
9699
--email) LE_EMAIL="${2:-}"; shift 2;;
97-
--no-flowd-go) INSTALL_FLOWD_GO=false; shift;;
98-
--experiment-id) FLOWD_GO_EXPERIMENT_ID="${2:-}"; shift 2;;
100+
--no-flowd-go) INSTALL_FLOWD_GO=false; shift;;
101+
--experiment-id) FLOWD_GO_EXPERIMENT_ID="${2:-}"; shift 2;;
102+
--no-firefly-receiver) NO_FIREFLY_RECEIVER=true; shift;;
99103
--help|-h) sed -n '1,80p' "$0"; exit 0;;
100104
*) echo "Unknown argument: $1" >&2; exit 2;;
101105
esac
@@ -307,6 +311,7 @@ step_flowd_go() {
307311
local flowd_cmd=("$HELPER_DIR/tools_scripts/perfSONAR-install-flowd-go.sh")
308312
[ "$AUTO_YES" = true ] && flowd_cmd+=(--yes)
309313
[ -n "$FLOWD_GO_EXPERIMENT_ID" ] && flowd_cmd+=(--experiment-id "$FLOWD_GO_EXPERIMENT_ID")
314+
[ "$NO_FIREFLY_RECEIVER" = true ] && flowd_cmd+=(--no-firefly-receiver)
310315

311316
if [ -x "$HELPER_DIR/tools_scripts/perfSONAR-install-flowd-go.sh" ]; then
312317
run "${flowd_cmd[@]}" || true

docs/perfsonar/tools_scripts/scripts.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ e1944123e17c89e8f202cca960f147397d64ae1e675af132c84b02ced2564abb node_exporter.
1818
50dfab90bc21d5c566b713f48b00b079a32a8b8756432a0d0f66ac6a64e6e581 perfSONAR-health-monitor.sh
1919
d8e3cc4a03725c7fb6e12c13e5036e7c6a3af301a1f1e728690ce9ad3ab8aa96 install_tools_scripts.sh
2020
7be726de5dfdbe8f7f5ac8e803b0b71e8f98f1ba274ca70b42f8eba4822cc67b perfSONAR-orchestrator.sh
21-
09ac11b5d9e1a6c769387f2179eec201b605efbb8d4ff623e81df9606b15a50d perfSONAR-toolkit-install.sh
21+
e710b020c39033406a7184e984687bf9c95c60e30b4136b2d7d0c756d5b0f323 perfSONAR-toolkit-install.sh
2222
2615a29d65e285391adb547046584c4534ea548e69571b67e0cf35773b010c57 perfSONAR-diagnostic-report.sh
2323
ac0c8fd6f27cc156ec05c7e6ac3547e0732f436a7033dac34475ece5641a284f docs/perfsonar/tools_scripts/perfSONAR-install-flowd-go.sh
2424
39d226a857eb1a0956003c75ca8b558fcb55c63176286ca9597f031d08cb38a7 docs/perfsonar/tools_scripts/update-perfsonar-deployment.sh

0 commit comments

Comments
 (0)