From 35c5f2ff0d91606e52eec3bfc85a9c4f61ebcc8a Mon Sep 17 00:00:00 2001 From: Lars Beckers <lars.beckers@rwth-aachen.de> Date: Tue, 22 Nov 2016 22:46:46 +0100 Subject: [PATCH] add archive role by restructuring tsm roles --- tsm-archive/meta/main.yml | 3 ++ tsm-archive/tasks/main.yml | 9 ++++ tsm-archive/templates/dsm.sys.j2 | 45 +++++++++++++++++++ .../files/dsmc.service | 0 tsm-backup/handlers/main.yml | 8 ++++ tsm-backup/meta/main.yml | 3 ++ tsm-backup/tasks/main.yml | 27 +++++++++++ .../templates/dsm.sys.j2 | 0 tsm7-client/handlers/main.yml | 5 --- tsm7-client/tasks/main.yml | 28 ------------ 10 files changed, 95 insertions(+), 33 deletions(-) create mode 100644 tsm-archive/meta/main.yml create mode 100644 tsm-archive/tasks/main.yml create mode 100644 tsm-archive/templates/dsm.sys.j2 rename {tsm7-client => tsm-backup}/files/dsmc.service (100%) create mode 100644 tsm-backup/handlers/main.yml create mode 100644 tsm-backup/meta/main.yml create mode 100644 tsm-backup/tasks/main.yml rename {tsm7-client => tsm-backup}/templates/dsm.sys.j2 (100%) diff --git a/tsm-archive/meta/main.yml b/tsm-archive/meta/main.yml new file mode 100644 index 0000000..bef00f3 --- /dev/null +++ b/tsm-archive/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: tsm7-client diff --git a/tsm-archive/tasks/main.yml b/tsm-archive/tasks/main.yml new file mode 100644 index 0000000..ee494bf --- /dev/null +++ b/tsm-archive/tasks/main.yml @@ -0,0 +1,9 @@ +--- +# 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 + diff --git a/tsm-archive/templates/dsm.sys.j2 b/tsm-archive/templates/dsm.sys.j2 new file mode 100644 index 0000000..382a09c --- /dev/null +++ b/tsm-archive/templates/dsm.sys.j2 @@ -0,0 +1,45 @@ +****************************************************************** +* +* 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 + diff --git a/tsm7-client/files/dsmc.service b/tsm-backup/files/dsmc.service similarity index 100% rename from tsm7-client/files/dsmc.service rename to tsm-backup/files/dsmc.service diff --git a/tsm-backup/handlers/main.yml b/tsm-backup/handlers/main.yml new file mode 100644 index 0000000..015475d --- /dev/null +++ b/tsm-backup/handlers/main.yml @@ -0,0 +1,8 @@ +--- +# 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 diff --git a/tsm-backup/meta/main.yml b/tsm-backup/meta/main.yml new file mode 100644 index 0000000..bef00f3 --- /dev/null +++ b/tsm-backup/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: tsm7-client diff --git a/tsm-backup/tasks/main.yml b/tsm-backup/tasks/main.yml new file mode 100644 index 0000000..d274a19 --- /dev/null +++ b/tsm-backup/tasks/main.yml @@ -0,0 +1,27 @@ +--- +# 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 diff --git a/tsm7-client/templates/dsm.sys.j2 b/tsm-backup/templates/dsm.sys.j2 similarity index 100% rename from tsm7-client/templates/dsm.sys.j2 rename to tsm-backup/templates/dsm.sys.j2 diff --git a/tsm7-client/handlers/main.yml b/tsm7-client/handlers/main.yml index bd3028a..eac3f5c 100644 --- a/tsm7-client/handlers/main.yml +++ b/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 diff --git a/tsm7-client/tasks/main.yml b/tsm7-client/tasks/main.yml index bc01953..9b63bc6 100644 --- a/tsm7-client/tasks/main.yml +++ b/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 -- GitLab