Remove slurm-configurator, as the charms moved to configless

remove nrpe relation
charmed-hpc · May 21, 2021 · 502bedc · 502bedc
1 parent 1c51d58
commit 502bedc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,5 @@
 clean: ## Remove all deployed applications
 	juju remove-application --force percona-cluster \
-	                                slurm-configurator \
 	                                slurmctld \
 	                                slurmd \
 	                                slurmdbd \

diff --git a/slurm-core/bundle.yaml b/slurm-core/bundle.yaml
@@ -2,29 +2,24 @@ applications:
   slurmctld:
     charm: ./../../slurm-charms/slurmctld.charm
     num_units: 1
+    options:
+      custom-config: |
+        SlurmctldDebug=debug5
+        SlurmdDebug=debug5
   slurmd:
     charm: ./../../slurm-charms/slurmd.charm
     num_units: 1
   slurmdbd:
     charm: ./../../slurm-charms/slurmdbd.charm
     num_units: 1
-  slurm-configurator:
-    charm: ./../../slurm-charms/slurm-configurator.charm
-    num_units: 1
-    options:
-      custom_config: |
-        SlurmctldDebug=debug5
-        SlurmdDebug=debug5
   percona-cluster:
     charm: cs:percona-cluster-293
     series: bionic
     num_units: 1
 relations:
   - - slurmdbd:db
     - percona-cluster:db
-  - - slurm-configurator:slurmdbd
+  - - slurmctld:slurmdbd
     - slurmdbd:slurmdbd
-  - - slurm-configurator:slurmd
+  - - slurmctld:slurmd
     - slurmd:slurmd
-  - - slurm-configurator:slurmctld
-    - slurmctld:slurmctld
diff --git a/slurm-core/clouds/aws.yaml b/slurm-core/clouds/aws.yaml
@@ -9,40 +9,25 @@ applications:
       db-admin: nat
       ha: nat
       master: nat
-      nrpe-external-master: nat
       shared-db: nat
       slave: nat
-  slurm-configurator:
+  slurmctld:
     constraints: instance-type=t3.medium spaces=nat
     bindings:
       "": nat
-      elasticsearch: nat
-      grafana-source: nat
-      influxdb-api: nat
-      prolog-epilog: nat
-      slurmctld: nat
       slurmd: nat
       slurmdbd: nat
-      slurmrestd: nat
-  slurmctld:
-    constraints: instance-type=t3.medium spaces=nat
-    bindings:
-      "": nat
-      nrpe-external-master: nat
-      slurmctld: nat
       slurmctld-peer: nat
   slurmd:
     constraints: instance-type=t3.medium spaces=nat
     bindings:
       "": nat
-      nrpe-external-master: nat
       slurmd: nat
       slurmd-peer: nat
   slurmdbd:
     constraints: instance-type=t3.medium spaces=nat
     bindings:
       "": nat
       db: nat
-      nrpe-external-master: nat
       slurmdbd: nat
       slurmdbd-peer: nat
diff --git a/slurm-core/clouds/lxd.yaml b/slurm-core/clouds/lxd.yaml
@@ -1,4 +1,4 @@
 applications:
-  slurm-configurator:
+  slurmctld:
     options:
-      proctrack_type: proctrack/linuxproc
+      proctrack-type: proctrack/linuxproc
diff --git a/slurm-core/focal/bundle.yaml b/slurm-core/focal/bundle.yaml
@@ -4,5 +4,5 @@ applications:
     charm: ./../../../slurm-charms/slurmrestd.charm
     num_units: 1
 relations:
-  - - slurm-configurator:slurmrestd
+  - - slurmctld:slurmrestd
     - slurmrestd:slurmrestd