From 2a211d002e2e53b833a66bb58d9b35e4fb53f75a Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 4 Nov 2024 15:01:42 -0800 Subject: [PATCH 1/3] make job settings generic and remove unused code Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/HZSPRINT.J2 | 2 +- .../inventories/host_vars/zos_host.yml | 4 ++-- ibm_concert/cert_renewal/renew_cert.yml | 20 +++++++++--------- ibm_concert/cert_renewal/send_cert_data.yml | 21 +++++++++---------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/ibm_concert/cert_renewal/HZSPRINT.J2 b/ibm_concert/cert_renewal/HZSPRINT.J2 index 121fcdc2..6b3cda5e 100644 --- a/ibm_concert/cert_renewal/HZSPRINT.J2 +++ b/ibm_concert/cert_renewal/HZSPRINT.J2 @@ -1,4 +1,4 @@ -{{ JOB_CARD }} +{{ HZSPRINT_JOB_CARD }} //HZSPRINT EXEC PGM=HZSPRNT,TIME=1440,REGION=0M,PARMDD=SYSIN //SYSIN DD *,DLM='@@' CHECK(IBMRACF,RACF_CERTIFICATE_EXPIRATION) diff --git a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml index f354dc32..8ff7d4dc 100644 --- a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml +++ b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml @@ -25,6 +25,6 @@ ZOAU: "path_to_zoau" ansible_python_interpreter: "{{ PYZ }}/bin/python3" # varibles for templates -JOB_CARD: |- +HZSPRINT_JOB_CARD: |- //HZSPRINT JOB , - // MSGCLASS=H,MSGLEVEL=(1,1),CLASS=A + // MSGCLASS=msg_class,MSGLEVEL=(1,1),CLASS=job_class diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index 0767fc4f..f317c44e 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -33,7 +33,7 @@ cert_found: false today: '' - uss_file_path: '{{ playbook_tmp_dir.path }}' + # uss_file_path: '{{ playbook_tmp_dir.path }}' tasks: - ansible.builtin.debug: @@ -64,11 +64,11 @@ 'cert_type': 'CERTAUTH' when: arg_cert_type is search('CERTAUTH') - - name: Create temporary directory for playbook use - ansible.builtin.tempfile: - state: directory - path: /tmp - register: playbook_tmp_dir + # - name: Create temporary directory for playbook use + # ansible.builtin.tempfile: + # state: directory + # path: /tmp + # register: playbook_tmp_dir - block: - name: Run Health Checker @@ -295,10 +295,10 @@ delegate_to: localhost always: - - name: Delete the temporary directory - ansible.builtin.file: - path: "{{ playbook_tmp_dir.path }}" - state: absent + # - name: Delete the temporary directory + # ansible.builtin.file: + # path: "{{ playbook_tmp_dir.path }}" + # state: absent - name: Delete the CSV on z/OS ansible.builtin.file: path: /tmp/{{ concert_csv_file }} diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 383bd28a..1a2aea0e 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -6,7 +6,6 @@ gather_facts: false environment: "{{ environment_vars }}" vars: - # IBM Concert variables concert_hostname: '' concert_instance_id: '' @@ -26,14 +25,14 @@ sysout_lines: [] cert_found: false - uss_file_path: '{{ playbook_tmp_dir.path }}' + # uss_file_path: '{{ playbook_tmp_dir.path }}' tasks: - - name: Create temporary directory to store bank files - ansible.builtin.tempfile: - state: directory - path: /tmp - register: playbook_tmp_dir + # - name: Create temporary directory to store bank files + # ansible.builtin.tempfile: + # state: directory + # path: /tmp + # register: playbook_tmp_dir - block: - name: Run Health Checker @@ -175,10 +174,10 @@ delegate_to: localhost always: - - name: Delete the temporary directory - ansible.builtin.file: - path: "{{ playbook_tmp_dir.path }}" - state: absent + # - name: Delete the temporary directory + # ansible.builtin.file: + # path: "{{ playbook_tmp_dir.path }}" + # state: absent - name: Delete the CSV on z/os ansible.builtin.file: path: /tmp/{{ concert_csv_file }} From fc9ec5b21bd9ad4b5f1b39c4b3695ed09cb61b32 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 4 Nov 2024 15:07:45 -0800 Subject: [PATCH 2/3] make job card even more generic Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/HZSPRINT.J2 | 2 +- ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm_concert/cert_renewal/HZSPRINT.J2 b/ibm_concert/cert_renewal/HZSPRINT.J2 index 6b3cda5e..121fcdc2 100644 --- a/ibm_concert/cert_renewal/HZSPRINT.J2 +++ b/ibm_concert/cert_renewal/HZSPRINT.J2 @@ -1,4 +1,4 @@ -{{ HZSPRINT_JOB_CARD }} +{{ JOB_CARD }} //HZSPRINT EXEC PGM=HZSPRNT,TIME=1440,REGION=0M,PARMDD=SYSIN //SYSIN DD *,DLM='@@' CHECK(IBMRACF,RACF_CERTIFICATE_EXPIRATION) diff --git a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml index 8ff7d4dc..e4ef41b0 100644 --- a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml +++ b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml @@ -25,6 +25,6 @@ ZOAU: "path_to_zoau" ansible_python_interpreter: "{{ PYZ }}/bin/python3" # varibles for templates -HZSPRINT_JOB_CARD: |- - //HZSPRINT JOB , +JOB_CARD: |- + //ANSIBLE JOB , // MSGCLASS=msg_class,MSGLEVEL=(1,1),CLASS=job_class From 40faea677f3aebd87bf24340f56b0bdd17cad404 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 4 Nov 2024 15:25:22 -0800 Subject: [PATCH 3/3] remove unused code Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/renew_cert.yml | 13 ------------- ibm_concert/cert_renewal/send_cert_data.yml | 11 ----------- 2 files changed, 24 deletions(-) diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index f317c44e..d25fecdd 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -25,7 +25,6 @@ cert_type: 'USER' # defautl to USER cert_label: '' sign_with: 'CERTAUTH' # blank or CERTAUTH - # sign_label: 'IBM CA' keyring_name: '' expiry_date: '2025-12-31' cert_detail: {} @@ -33,8 +32,6 @@ cert_found: false today: '' - # uss_file_path: '{{ playbook_tmp_dir.path }}' - tasks: - ansible.builtin.debug: var: sn_short_desc @@ -64,12 +61,6 @@ 'cert_type': 'CERTAUTH' when: arg_cert_type is search('CERTAUTH') - # - name: Create temporary directory for playbook use - # ansible.builtin.tempfile: - # state: directory - # path: /tmp - # register: playbook_tmp_dir - - block: - name: Run Health Checker ibm.ibm_zos_core.zos_operator: @@ -295,10 +286,6 @@ delegate_to: localhost always: - # - name: Delete the temporary directory - # ansible.builtin.file: - # path: "{{ playbook_tmp_dir.path }}" - # state: absent - name: Delete the CSV on z/OS ansible.builtin.file: path: /tmp/{{ concert_csv_file }} diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 1a2aea0e..459d02d5 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -25,15 +25,8 @@ sysout_lines: [] cert_found: false - # uss_file_path: '{{ playbook_tmp_dir.path }}' tasks: - # - name: Create temporary directory to store bank files - # ansible.builtin.tempfile: - # state: directory - # path: /tmp - # register: playbook_tmp_dir - - block: - name: Run Health Checker ibm.ibm_zos_core.zos_operator: @@ -174,10 +167,6 @@ delegate_to: localhost always: - # - name: Delete the temporary directory - # ansible.builtin.file: - # path: "{{ playbook_tmp_dir.path }}" - # state: absent - name: Delete the CSV on z/os ansible.builtin.file: path: /tmp/{{ concert_csv_file }}