Skip to content
This repository has been archived by the owner on Aug 9, 2024. It is now read-only.

Commit

Permalink
use version as provided by lib apt
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesbeedy committed Feb 15, 2024
1 parent d88d740 commit cb2a668
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 2 deletions.
54 changes: 54 additions & 0 deletions rats1
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
series: jammy
applications:
mysql:
charm: mysql
channel: 8.0/edge
revision: 209
num_units: 1
to:
- "0"
constraints: arch=amd64
storage:
database: rootfs,1,1024M
slurmd:
charm: slurmd
channel: edge
revision: 81
num_units: 1
to:
- "2"
constraints: arch=amd64
slurmdbd:
charm: slurmdbd
channel: edge
revision: 51
num_units: 1
to:
- "3"
constraints: arch=amd64
slurmdbd-mysql-router:
charm: mysql-router
channel: dpe/edge
revision: 136
slurmrestd:
charm: slurmrestd
channel: edge
revision: 54
num_units: 1
to:
- "4"
constraints: arch=amd64
machines:
"0":
constraints: arch=amd64
"2":
constraints: arch=amd64
"3":
constraints: arch=amd64
"4":
constraints: arch=amd64
relations:
- - slurmdbd-mysql-router:backend-database
- mysql:database
- - slurmdbd:database
- slurmdbd-mysql-router:database
2 changes: 1 addition & 1 deletion src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def _on_show_current_config(self, event):

def _on_install(self, event):
"""Perform installation operations for slurmctld."""
self.unit.set_workload_version(Path("version").read_text().strip())
self.unit.set_workload_version(self._slurm_manager.version())

self.unit.status = WaitingStatus("Installing slurmctld")

Expand Down
2 changes: 1 addition & 1 deletion src/slurmctld_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def _slurm_plugin_dir(self) -> Path:
def _mail_prog(self) -> Path:
return Path("/usr/bin/mail.mailutils")

def slurm_version(self) -> str:
def version(self) -> str:
"""Return slurm version."""
return Slurmctld().version()

Expand Down

0 comments on commit cb2a668

Please sign in to comment.