diff --git a/CHANGELOG b/CHANGELOG index af2c1e79..5253d2d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,8 @@ This file keeps track of all notable changes to the Slurm Charms. Unreleased ---------- +- removed the nhc resource and packed the nhc tar file along with slurmd charm + 1.1.1 - 2023-06-27 ------------------ diff --git a/charm-slurmd/metadata.yaml b/charm-slurmd/metadata.yaml index 1fdf4de7..06d81c2f 100644 --- a/charm-slurmd/metadata.yaml +++ b/charm-slurmd/metadata.yaml @@ -34,10 +34,3 @@ requires: peers: slurmd-peer: interface: slurmd-peer - -resources: - nhc: - type: file - filename: lbnl-nhc-1.4.3.tar.gz - description: | - Official tarball containing NHC. Retrieved from Github Releases. diff --git a/charm-slurmd/src/charm.py b/charm-slurmd/src/charm.py index 03233db6..26f854c0 100755 --- a/charm-slurmd/src/charm.py +++ b/charm-slurmd/src/charm.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 """SlurmdCharm.""" +import os import json import logging from pathlib import Path @@ -19,6 +20,8 @@ logger = logging.getLogger() +RESOURCES_DIR = Path(os.path.dirname(os.path.abspath(__file__))) / "resources" + class SlurmdStart(EventBase): """Emitted when slurmd should start.""" @@ -91,14 +94,10 @@ def __init__(self, *args): def _on_install(self, event): """Perform installation operations for slurmd.""" - try: - nhc_path = self.model.resources.fetch("nhc") - logger.debug(f"## Found nhc resource: {nhc_path}") - except Exception as e: - logger.error(f"## Missing nhc resource: {e}") - self.unit.status = BlockedStatus("Missing nhc resource") - event.defer() - return + + # official tarball containing NHC, retrieved from Github Releases + nhc_path = RESOURCES_DIR / "lbnl-nhc-1.4.3.tar.gz" + logger.debug(f"## Found nhc resource: {nhc_path}") self.unit.set_workload_version(Path("version").read_text().strip()) self.unit.status = WaitingStatus("Installing slurmd") diff --git a/charm-slurmd/src/resources/lbnl-nhc-1.4.3.tar.gz b/charm-slurmd/src/resources/lbnl-nhc-1.4.3.tar.gz new file mode 100644 index 00000000..aa5d4f6a Binary files /dev/null and b/charm-slurmd/src/resources/lbnl-nhc-1.4.3.tar.gz differ