Merge branch 'master' of git.fsmpi.rwth-aachen.de:infra/ansible

tsm-archive/meta/main.yml

+---
+dependencies:
+  - role: tsm7-client

tsm-archive/tasks/main.yml

+---
+# file: roles/tsm-archive/tasks/main.yml
+
+- name: ensure deployment of our config
+  template: src=dsm.sys.j2 dest=/opt/tivoli/tsm/client/ba/bin/dsm.sys
+  tags:
+    - tsm
+    - config
+

tsm-archive/templates/dsm.sys.j2

+******************************************************************
+*
+* dsm.sys option file for Unix Clients
+*
+******************************************************************
+
+
+* TSM-Server und Ports ermitteln und eintragen
+* z.B. TSM-Server b06.rz.rwth-aachen.de (Port 1506)
+* ---------------------------------------------------------------
+DEFAULTSERVER                 bas{{ archivenode }}.itc.rwth-aachen.de
+SERVERNAME                    bas{{ archivenode }}.itc.rwth-aachen.de
+TCPSERVERADDRESS              bas{{ archivenode }}.itc.rwth-aachen.de
+TCPPORT                       {{ archiveport }}
+
+
+* Die folgenden 4 Eintrage unveraendert lassen
+* ---------------------------------------------------------------
+COMMMETHOD                    tcpip
+PASSWORDACCESS                generate
+SCHEDMODE                     polling
+TXNBYTELIMIT                  25600
+
+
+* Geben Sie mit NODENAME den Namen des Rechners an, wie er
+* im TSM-Server registriert ist. Der NODENAME wird beim 
+* Anlegen eines neuen Knotens ueber das Backup-Portal gesetzt.
+* ----------------------------------------------------------------
+NODENAME                      {{ archivename }}
+
+
+* Logfiles
+* ----------------------------------------------------------------
+SCHEDLOGNAME                  /var/log/dsm/dsmsched.log
+ERRORLOGNAME                  /var/log/dsm/dsmerror.log
+
+
+* Haltezeit (Tage) fuer Eintraege im Scheduler- und Errorlogfile 
+* festlegen
+* Schedulerlogdatei: 90 Tage
+* Errorlogdatei    :  1 Jahr
+* ----------------------------------------------------------------
+SCHEDLOGRETENTION             90 D
+ERRORLOGRETENTION             365 D
+

tsm-backup/handlers/main.yml

+---
+# file: roles/tsm-backup/handlers/main.yml
+
+- name: reload systemd service files
+  command: systemctl daemon-reload
+
+- name: restart tsm service
+  service: name=dsmc state=restarted

tsm-backup/meta/main.yml

+---
+dependencies:
+  - role: tsm7-client

tsm-backup/tasks/main.yml

+---
+# file: roles/tsm-backup/tasks/main.yml
+
+- name: ensure systemd service file is available
+  copy: src=dsmc.service dest=/etc/systemd/system/dsmc.service
+  notify:
+    - reload systemd service files
+  tags:
+    - tsm
+    - config
+    - service
+
+- name: ensure deployment of our config
+  template: src=dsm.sys.j2 dest=/opt/tivoli/tsm/client/ba/bin/dsm.sys
+  notify:
+    - restart tsm service
+  tags:
+    - tsm
+    - config
+
+- name: ensure tsm service is enabled and running
+  service: name=dsmc enabled=yes state=started
+  tags:
+    - tsm
+    - service
+
+- meta: flush_handlers

tsm7-client/handlers/main.yml

@@ -4,8 +4,3 @@
 - name: ldconfig tsm
   command: ldconfig
 
-- name: reload systemd service files
-  command: systemctl daemon-reload
-
-- name: restart tsm service
-  service: name=dsmc state=restarted

tsm7-client/tasks/main.yml

@@ -33,15 +33,6 @@
     - packages
     - deb-updates
 
-- name: ensure systemd service file is available
-  copy: src=dsmc.service dest=/etc/systemd/system/dsmc.service
-  notify:
-    - reload systemd service files
-  tags:
-    - tsm
-    - config
-    - service
-
 - name: ensure old tsm6 dependend packages are absent
   apt: name={{ item }} state=absent
   with_items:
@@ -64,8 +55,6 @@
 
 - name: ensure special dsmc script is in place
   copy: src=dsmc dest=/usr/local/bin/dsmc mode=0755 owner=root group=root
-  notify:
-    - restart tsm service
   tags:
     - tsm
     - config
@@ -74,7 +63,6 @@
   file: path=/etc/ld.so.conf.d/tsm-ld.so.conf state=absent
   notify:
     - ldconfig tsm
-    - restart tsm service
   tags:
     - tsm
     - config
@@ -88,8 +76,6 @@
     - gskcrypt64
     - tivsm-ba
     - tivsm-api64
-  notify:
-    - restart tsm service
   tags:
     - tsm
     - packages
@@ -100,18 +86,4 @@
     - tsm
     - config
 
-- name: ensure deployment of our config
-  template: src=dsm.sys.j2 dest=/opt/tivoli/tsm/client/ba/bin/dsm.sys
-  notify:
-    - restart tsm service
-  tags:
-    - tsm
-    - config
-
-- name: ensure tsm service is enabled and running
-  service: name=dsmc enabled=yes state=started
-  tags:
-    - tsm
-    - service
-
 - meta: flush_handlers