restructured playbooks, cleanup

roles/cobald/tasks/grafana.yml

@@ -14,11 +14,12 @@
 - name: run grafana
   docker_container:
     name: ed-grafana
-    image: grafana/grafana:7.5.7
+    image: docker.io/grafana/grafana:7.5.7
     hostname: ed-grafana
     domainname: cobald.local
     networks:
     - name: "{{cobald_docker_network}}"
+    networks_cli_compatible: True
     published_ports:
     - "3000:3000"
     state: started
@@ -42,7 +43,6 @@
       version: Flux
     additional_secure_json_data:
       token: "{{influx_grafana_token.token}}"
-  register: das
 
 - community.grafana.grafana_dashboard:
     grafana_url: http://localhost:3000

roles/cobald/tasks/influxdb.yml

@@ -1,11 +1,12 @@
 - name: run influxdb in docker container
   docker_container:
     name: ed-influxdb
-    image: influxdb
+    image: docker.io/library/influxdb:2.0
     hostname: "{{influx_hostname}}"
     domainname: "{{influx_domainname}}"
     networks:
     - name: "{{ cobald_docker_network }}"
+    networks_cli_compatible: True
     published_ports:
     - "{{influx_pubport}}:8086"
     volumes:
@@ -21,7 +22,6 @@
     state: started
     detach: True
     cleanup: True
-    networks_cli_compatible: True
 
 - name: add ansible connection to influxdb container
   add_host:

roles/cobald/tasks/main.yml

@@ -1,5 +1,6 @@
 - include_vars: cobald-slurm.yml
   when: cobald_slurm | default(False)
+  tags: always
 
 - name: build cobald:slurm docker image
   include_role:

roles/slurm/files/slurm.Dockerfile

@@ -1,43 +0,0 @@
-FROM docker.io/library/centos:7 as base
-
-RUN yum install -y epel-release && \
-	yum install -y slurm && \
-	yum clean all && rm -rf /var/cache/yum
-
-RUN	yum install -y less iproute bind-utils nmap-ncat net-tools && \
-	yum clean all && rm -rf /var/cache/yum
-
-COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
-
-RUN chown root:root /usr/local/sbin/entrypoint.sh && \
-	chmod 755 /usr/local/sbin/entrypoint.sh
-
-ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
-
-ARG slurmuser=slurm
-ENV slurmuser=${slurmuser}
-
-RUN useradd -d /var/lib/slurm -m --no-log-init --system $slurmuser &&\
-	slurm-setuser -u $slurmuser -g $slurmuser -y
-
-ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
-ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
-ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
-
-FROM base as slurmd
-
-RUN	yum install -y slurm-slurmd && \
-	yum clean all && rm -rf /var/cache/yum
-
-CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & \
-	slurmd -D 2>/dev/null 1>/dev/null & \
-	tail --retry --pid $! -f ${SLURMD_LOG_PATH} ${SLURM_SCHED_LOG_PATH} & })'
-
-FROM base as slurmctld
-
-RUN	yum install -y slurm-slurmctld && \
-	yum clean all && rm -rf /var/cache/yum
-
-CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & \
-	su -s /bin/sh -c "slurmctld -D" ${slurmuser} 2>/dev/null 1>/dev/null & \
-	tail --retry --pid $! -f ${SLURMCTLD_LOG_PATH} ${SLURM_SCHED_LOG_PATH} & })'