From 7ffc22056f2fa5e6cd42e9a33173843b18f360ab Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Wed, 30 Oct 2024 18:42:40 -0700 Subject: [PATCH 01/10] Do not use collections Signed-off-by: Andrew Nguyen --- {collections => collections_old}/requirements.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {collections => collections_old}/requirements.yml (100%) diff --git a/collections/requirements.yml b/collections_old/requirements.yml similarity index 100% rename from collections/requirements.yml rename to collections_old/requirements.yml From d258eba1edb84e93b73e656b88e553061c2387b1 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Wed, 30 Oct 2024 18:52:13 -0700 Subject: [PATCH 02/10] no role for zos_job_submit Signed-off-by: Andrew Nguyen --- .../print_hc_buffer/templates => }/HZSPRINT.J2 | 0 ibm_concert/cert_renewal/renew_cert.yml | 15 +++++++++++---- ibm_concert/cert_renewal/send_cert_data.yml | 15 +++++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) rename ibm_concert/cert_renewal/{roles/print_hc_buffer/templates => }/HZSPRINT.J2 (100%) diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/templates/HZSPRINT.J2 b/ibm_concert/cert_renewal/HZSPRINT.J2 similarity index 100% rename from ibm_concert/cert_renewal/roles/print_hc_buffer/templates/HZSPRINT.J2 rename to ibm_concert/cert_renewal/HZSPRINT.J2 diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index 865ea6a7..64fc1d82 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -77,10 +77,17 @@ task_description: 'Run Health Checker' command: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" - - ansible.builtin.include_role: - name: print_hc_buffer - vars: - hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' + - name: Get expiring certs report for {{ hc_check }} + ibm.ibm_zos_core.zos_job_submit: + src: '{{ playbook_dir }}/HZSPRINT.J2' + location: local + use_template: true + register: hc_job_output + + # - ansible.builtin.include_role: + # name: print_hc_buffer + # vars: + # hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' - name: Search for {{cert_label}} in report ansible.builtin.set_fact: diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 6e5aa4fe..7ff2032d 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -41,10 +41,17 @@ task_description: 'Run Health Checker' command: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" - - ansible.builtin.include_role: - name: print_hc_buffer - vars: - hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' + - name: Get expiring certs report for {{ hc_check }} + ibm.ibm_zos_core.zos_job_submit: + src: '{{ playbook_dir }}/HZSPRINT.J2' + location: local + use_template: true + register: hc_job_output + + # - ansible.builtin.include_role: + # name: print_hc_buffer + # vars: + # hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' - name: Get report lines ansible.builtin.set_fact: From df89b5598f41ece2275c90eaa60a384c08b11ec3 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:13:55 -0700 Subject: [PATCH 03/10] remove roles Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/HZSPRINT.J2 | 2 +- .../inventories/host_vars/zos_host.yml | 7 ++ ibm_concert/cert_renewal/renew_cert.yml | 76 ++++++++----------- .../roles/issue_operator_cmd/README.md | 53 ------------- .../issue_operator_cmd/defaults/main.yml | 4 - .../issue_operator_cmd/handlers/main.yml | 2 - .../roles/issue_operator_cmd/meta/main.yml | 13 ---- .../roles/issue_operator_cmd/tasks/main.yml | 14 ---- .../roles/issue_operator_cmd/vars/main.yml | 4 - .../roles/issue_tso_cmd/README.md | 53 ------------- .../roles/issue_tso_cmd/defaults/main.yml | 4 - .../roles/issue_tso_cmd/handlers/main.yml | 2 - .../roles/issue_tso_cmd/meta/main.yml | 13 ---- .../roles/issue_tso_cmd/tasks/main.yml | 14 ---- .../roles/issue_tso_cmd/vars/main.yml | 4 - .../roles/print_hc_buffer/README.md | 48 ------------ .../roles/print_hc_buffer/defaults/main.yml | 8 -- .../roles/print_hc_buffer/handlers/main.yml | 2 - .../roles/print_hc_buffer/meta/main.yml | 13 ---- .../roles/print_hc_buffer/tasks/main.yml | 24 ------ .../roles/print_hc_buffer/vars/main.yml | 3 - .../roles/send-template/README.md | 38 ---------- .../roles/send-template/defaults/main.yml | 2 - .../roles/send-template/handlers/main.yml | 2 - .../roles/send-template/meta/main.yml | 60 --------------- .../roles/send-template/tasks/main.yml | 15 ---- .../roles/send-template/vars/main.yml | 2 - ibm_concert/cert_renewal/send_cert_data.yml | 73 +++++++++--------- 28 files changed, 78 insertions(+), 477 deletions(-) delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/README.md delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/defaults/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/handlers/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/meta/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/tasks/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_operator_cmd/vars/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/README.md delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/defaults/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/handlers/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/meta/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/tasks/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/issue_tso_cmd/vars/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/README.md delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/defaults/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/handlers/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/meta/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/tasks/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/print_hc_buffer/vars/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/send-template/README.md delete mode 100644 ibm_concert/cert_renewal/roles/send-template/defaults/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/send-template/handlers/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/send-template/meta/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/send-template/tasks/main.yml delete mode 100644 ibm_concert/cert_renewal/roles/send-template/vars/main.yml diff --git a/ibm_concert/cert_renewal/HZSPRINT.J2 b/ibm_concert/cert_renewal/HZSPRINT.J2 index 871cd395..121fcdc2 100644 --- a/ibm_concert/cert_renewal/HZSPRINT.J2 +++ b/ibm_concert/cert_renewal/HZSPRINT.J2 @@ -1,7 +1,7 @@ {{ JOB_CARD }} //HZSPRINT EXEC PGM=HZSPRNT,TIME=1440,REGION=0M,PARMDD=SYSIN //SYSIN DD *,DLM='@@' -CHECK({{ hc_check }}) +CHECK(IBMRACF,RACF_CERTIFICATE_EXPIRATION) ,EXCEPTIONS @@ //SYSOUT DD SYSOUT=A,DCB=(LRECL=256) 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 d3fbba3d..9df57ba1 100644 --- a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml +++ b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml @@ -23,3 +23,10 @@ ZOAU: "path_to_zoau" # variable`ansible_python_interpreter` ################################################################################ ansible_python_interpreter: "{{ PYZ }}/bin/python3" + + # //HZSPRINT JOB 'IMS SYSTEM', + # // NOTIFY=&SYSUID +# varibles for templates +JOB_CARD: |- + //HZSPRINT JOB , + // MSGCLASS=H,MSGLEVEL=(1,1),CLASS=A diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index 64fc1d82..112bba0a 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -7,17 +7,17 @@ environment: "{{ environment_vars }}" vars: # ServiceNow info - sn_hostname: "" - sn_username: "" - sn_pwd: "" - sn_incident_number: "" - sn_short_desc: "" + sn_hostname: "https://ibmglobalservicesdemo50.service-now.com/" + sn_username: "andyn" + sn_pwd: "ypc1cgt6PMJ5bdx@jfh" + sn_incident_number: "INC0010087" + sn_short_desc: "INC0010089@@@[From: IBM Concert] [Environment: prod] Certificate @@@STCUSR@@@concertCertificateTest2@@@ expires in about 1 year" # IBM Concert info - concert_hostname: "" - concert_instance_id: "" - concert_api_key: "" - concert_api_key_type: "" + concert_hostname: "93252.us-south-8.concert.saas.ibm.com" + concert_instance_id: "20241004-1336-0851-0172-bdce0ebbebf7" + concert_api_key: "YW5keS5uZ3V5ZW5AaWJtLmNvbTo4ZjRlMTZhYS0xN2RiLTQ5YWYtOTczOS1lZWEyZGFlOTY4ODQ=" + concert_api_key_type: "C_API_KEY" concert_csv_file: "zos-cert-data.csv" # variables for cert renewal logic @@ -71,24 +71,18 @@ register: playbook_tmp_dir - block: - - ansible.builtin.include_role: - name: issue_operator_cmd - vars: - task_description: 'Run Health Checker' - command: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" - - - name: Get expiring certs report for {{ hc_check }} + - name: Run Health Checker + ibm.ibm_zos_core.zos_operator: + cmd: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" + register: zos_operator_output + + - name: Get expiring certs report for IBMRACF,RACF_CERTIFICATE_EXPIRATION ibm.ibm_zos_core.zos_job_submit: src: '{{ playbook_dir }}/HZSPRINT.J2' location: local use_template: true register: hc_job_output - # - ansible.builtin.include_role: - # name: print_hc_buffer - # vars: - # hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' - - name: Search for {{cert_label}} in report ansible.builtin.set_fact: cert_found: true @@ -166,32 +160,27 @@ - ansible.builtin.debug: var: cert_args - - ansible.builtin.include_role: - name: issue_tso_cmd - vars: - task_description: 'Back up current certificate' - command: + - name: Back up current certificate + ibm.ibm_zos_core.zos_tso_command: + commands: - RACDCERT EXPORT(LABEL('{{cert_label}}')) DSN('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') {{cert_type}} - RACDCERT CHECKCERT('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') when: not cert_type == 'USER' - - - ansible.builtin.include_role: - - name: issue_tso_cmd - vars: - task_description: 'Back up current certificate' + register: tso_cmd_output + + - name: Back up current certificate + ibm.ibm_zos_core.zos_tso_command: command: - RACDCERT EXPORT(LABEL('{{cert_label}}')) ID({{owner_id}}) DSN('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') - RACDCERT CHECKCERT('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') ID({{owner_id}}) when: cert_type == 'USER' + register: tso_cmd_output - ansible.builtin.set_fact: random_str: "{{lookup('community.general.random_string', length=3, special=false)}}" - - ansible.builtin.include_role: - name: issue_tso_cmd - vars: - task_description: 'Rekey and Generate new cert request for {{cert_type}}' + - name: Rekey and Generate new cert request for {{cert_type}} + ibm.ibm_zos_core.zos_tso_command: command: - RACDCERT {{cert_type}} REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT {{cert_type}} ROLLOVER(LABEL('{{cert_label}}')) NEWLABEL('{{cert_label[:-3]}}{{random_str}}') @@ -199,11 +188,10 @@ - RACDCERT {{cert_type}} DELETE(LABEL('{{ cert_label }}')) - RACDCERT {{cert_type}} ALTER(LABEL('{{ cert_label[:-3]}}{{random_str}}')) NEWLABEL('{{ cert_label }}') when: cert_type == 'CERTAUTH' + register: tso_cmd_output - - ansible.builtin.include_role: - name: issue_tso_cmd - vars: - task_description: 'Rekey and Generate new cert request for {{cert_type}}' + - name: Rekey and Generate new cert request for {{cert_type}} + ibm.ibm_zos_core.zos_tso_command: command: - RACDCERT {{cert_type}} REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT {{cert_type}} GENREQ (LABEL('{{cert_label[:-3]}}{{random_str}}')) DSN('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') @@ -213,11 +201,10 @@ - RACDCERT {{cert_type}} DELETE(LABEL('{{ cert_label }}')) - RACDCERT {{cert_type}} ALTER(LABEL('{{ cert_label[:-3]}}{{random_str}}')) NEWLABEL('{{ cert_label }}') when: cert_type == 'SITE' + register: tso_cmd_output - - ansible.builtin.include_role: - name: issue_tso_cmd - vars: - task_description: 'Rekey and Generate new cert request for {{cert_type}}' + - name: Rekey and Generate new cert request for {{cert_type}} + ibm.ibm_zos_core.zos_tso_command: command: - RACDCERT ID({{owner_id}}) REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT ID({{owner_id}}) GENREQ (LABEL('{{cert_label[:-3]}}{{random_str}}')) DSN('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') @@ -227,6 +214,7 @@ - RACDCERT ID({{owner_id}}) DELETE(LABEL('{{cert_label}}')) - RACDCERT ID({{owner_id}}) ALTER(LABEL('{{ cert_label[:-3]}}{{random_str}}')) NEWLABEL('{{ cert_label }}') when: cert_type == 'USER' + register: tso_cmd_output - name: Save new expiration date ansible.builtin.set_fact: diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/README.md b/ibm_concert/cert_renewal/roles/issue_operator_cmd/README.md deleted file mode 100644 index b5ac60f9..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/README.md +++ /dev/null @@ -1,53 +0,0 @@ -add_certificate -========= - -Add a digital certificate to a key ring and activate it - -Requirements ------------- - -- Ansible Collection `ibm.ibm_zos_core` - -Role Variables --------------- - -- ### **command** - - Specifies operator command to be issued -- ### **task_description** - - Specifies a description related to the command to be issued - - -Example Playbook ----------------- - -```yaml -- hosts: all - collections: - - ibm.ibm_zos_core - gather_facts: no - environment: "{{ environment_vars }}" - vars: - - - include_role: - name: isssue_operator_cmd - vars: - command: 'd a,l' - task_description: 'Display active users' -``` - -License -------- - -Copyright (c) IBM Corporation 2024 Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0) - -Author Information ------------------- - -- Andy Nguyen andy.nguyen@ibm.com - -Copyright ---------- - -© Copyright IBM Corporation 2024 diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/defaults/main.yml b/ibm_concert/cert_renewal/roles/issue_operator_cmd/defaults/main.yml deleted file mode 100644 index ce02007f..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Copyright (c) IBM Corporation 2021 - -# defaults file for issue_operator_cmd diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/handlers/main.yml b/ibm_concert/cert_renewal/roles/issue_operator_cmd/handlers/main.yml deleted file mode 100644 index 45d2f690..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for issue_operator_cmd diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/meta/main.yml b/ibm_concert/cert_renewal/roles/issue_operator_cmd/meta/main.yml deleted file mode 100644 index f18426fc..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/meta/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) IBM Corporation 2021 - -galaxy_info: - author: Andy Nguyen - description: Ansible z/OS Core Developer - company: IBM - license: "Apache License, Version 2.0" - min_ansible_version: "2.9" - galaxy_tags: - - z - - zos - - z_os - - ibm_zos_core diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/tasks/main.yml b/ibm_concert/cert_renewal/roles/issue_operator_cmd/tasks/main.yml deleted file mode 100644 index 4b101d4e..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -############################################################################### -# © Copyright IBM Corporation 2024 -############################################################################### - -# tasks file for issue_operator_cmd - -########################################################################## -# Issue zos command -########################################################################## -- name: "{{ task_description }}" - ibm.ibm_zos_core.zos_operator: - cmd: "{{command}}" - register: zos_operator_output diff --git a/ibm_concert/cert_renewal/roles/issue_operator_cmd/vars/main.yml b/ibm_concert/cert_renewal/roles/issue_operator_cmd/vars/main.yml deleted file mode 100644 index f8f40d5d..00000000 --- a/ibm_concert/cert_renewal/roles/issue_operator_cmd/vars/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# vars file for issue_operator_cmd -command: '' -task_description: 'issue operator command' diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/README.md b/ibm_concert/cert_renewal/roles/issue_tso_cmd/README.md deleted file mode 100644 index b5ac60f9..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/README.md +++ /dev/null @@ -1,53 +0,0 @@ -add_certificate -========= - -Add a digital certificate to a key ring and activate it - -Requirements ------------- - -- Ansible Collection `ibm.ibm_zos_core` - -Role Variables --------------- - -- ### **command** - - Specifies operator command to be issued -- ### **task_description** - - Specifies a description related to the command to be issued - - -Example Playbook ----------------- - -```yaml -- hosts: all - collections: - - ibm.ibm_zos_core - gather_facts: no - environment: "{{ environment_vars }}" - vars: - - - include_role: - name: isssue_operator_cmd - vars: - command: 'd a,l' - task_description: 'Display active users' -``` - -License -------- - -Copyright (c) IBM Corporation 2024 Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0) - -Author Information ------------------- - -- Andy Nguyen andy.nguyen@ibm.com - -Copyright ---------- - -© Copyright IBM Corporation 2024 diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/defaults/main.yml b/ibm_concert/cert_renewal/roles/issue_tso_cmd/defaults/main.yml deleted file mode 100644 index ce02007f..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Copyright (c) IBM Corporation 2021 - -# defaults file for issue_operator_cmd diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/handlers/main.yml b/ibm_concert/cert_renewal/roles/issue_tso_cmd/handlers/main.yml deleted file mode 100644 index 45d2f690..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for issue_operator_cmd diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/meta/main.yml b/ibm_concert/cert_renewal/roles/issue_tso_cmd/meta/main.yml deleted file mode 100644 index f18426fc..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/meta/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) IBM Corporation 2021 - -galaxy_info: - author: Andy Nguyen - description: Ansible z/OS Core Developer - company: IBM - license: "Apache License, Version 2.0" - min_ansible_version: "2.9" - galaxy_tags: - - z - - zos - - z_os - - ibm_zos_core diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/tasks/main.yml b/ibm_concert/cert_renewal/roles/issue_tso_cmd/tasks/main.yml deleted file mode 100644 index 13313269..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -############################################################################### -# © Copyright IBM Corporation 2024 -############################################################################### - -# tasks file for issue_operator_cmd - -########################################################################## -# Issue zos command -########################################################################## -- name: "{{ task_description }}" - ibm.ibm_zos_core.zos_tso_command: - commands: "{{command}}" - register: tso_cmd_output diff --git a/ibm_concert/cert_renewal/roles/issue_tso_cmd/vars/main.yml b/ibm_concert/cert_renewal/roles/issue_tso_cmd/vars/main.yml deleted file mode 100644 index f8f40d5d..00000000 --- a/ibm_concert/cert_renewal/roles/issue_tso_cmd/vars/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# vars file for issue_operator_cmd -command: '' -task_description: 'issue operator command' diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/README.md b/ibm_concert/cert_renewal/roles/print_hc_buffer/README.md deleted file mode 100644 index 27442d69..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/README.md +++ /dev/null @@ -1,48 +0,0 @@ -print_hc_buffer -========= - -Extract Health Checker data - -Requirements ------------- - -- Ansible Collection `ibm.ibm_zos_core` - -Role Variables --------------- - -- ### **hc_check** - - Specifies the Health Checker check to print the data for - -Example Playbook ----------------- - -```yaml -- hosts: all - collections: - - ibm.ibm_zos_core - gather_facts: no - environment: "{{ environment_vars }}" - vars: - - - include_role: - name: print_hc_buffer - vars: - hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' -``` - -License -------- - -Copyright (c) IBM Corporation 2024 Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0) - -Author Information ------------------- - -- Andy Nguyen andy.nguyen@ibm.com - -Copyright ---------- - -© Copyright IBM Corporation 2024 diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/defaults/main.yml b/ibm_concert/cert_renewal/roles/print_hc_buffer/defaults/main.yml deleted file mode 100644 index 138f92b5..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Copyright (c) IBM Corporation 2021 - -# defaults file for print_hc_buffer -JOB_CARD: |- - //HZSPRINT JOB 'IMS SYSTEM', - // MSGCLASS=H,MSGLEVEL=(1,1),CLASS=A, - // NOTIFY=&SYSUID diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/handlers/main.yml b/ibm_concert/cert_renewal/roles/print_hc_buffer/handlers/main.yml deleted file mode 100644 index a6026e23..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for print_hc_buffer diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/meta/main.yml b/ibm_concert/cert_renewal/roles/print_hc_buffer/meta/main.yml deleted file mode 100644 index f18426fc..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/meta/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) IBM Corporation 2021 - -galaxy_info: - author: Andy Nguyen - description: Ansible z/OS Core Developer - company: IBM - license: "Apache License, Version 2.0" - min_ansible_version: "2.9" - galaxy_tags: - - z - - zos - - z_os - - ibm_zos_core diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/tasks/main.yml b/ibm_concert/cert_renewal/roles/print_hc_buffer/tasks/main.yml deleted file mode 100644 index 97f168e4..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -############################################################################### -# © Copyright IBM Corporation 2024 -############################################################################### - -# tasks file for print_hc_buffer -########################################################################### -# skeleton for HZSPRNT -########################################################################### -- name: Send JCL template - block: - - ansible.builtin.set_fact: - eager_role_path: '{{ role_path }}' - - - ansible.builtin.include_role: - name: send-template - vars: - path: '{{ eager_role_path }}/templates/HZSPRINT.J2' - - - name: Get expiring certs report for {{ hc_check }} - ibm.ibm_zos_core.zos_job_submit: - src: '{{ uss_file_path }}/HZSPRINT.J2' - location: USS - register: hc_job_output diff --git a/ibm_concert/cert_renewal/roles/print_hc_buffer/vars/main.yml b/ibm_concert/cert_renewal/roles/print_hc_buffer/vars/main.yml deleted file mode 100644 index e4ead5f3..00000000 --- a/ibm_concert/cert_renewal/roles/print_hc_buffer/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# vars file for print_hc_buffer -hc_check: '' diff --git a/ibm_concert/cert_renewal/roles/send-template/README.md b/ibm_concert/cert_renewal/roles/send-template/README.md deleted file mode 100644 index 225dd44b..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/ibm_concert/cert_renewal/roles/send-template/defaults/main.yml b/ibm_concert/cert_renewal/roles/send-template/defaults/main.yml deleted file mode 100644 index fa39aa05..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for send-template diff --git a/ibm_concert/cert_renewal/roles/send-template/handlers/main.yml b/ibm_concert/cert_renewal/roles/send-template/handlers/main.yml deleted file mode 100644 index cdbf5309..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for send-template diff --git a/ibm_concert/cert_renewal/roles/send-template/meta/main.yml b/ibm_concert/cert_renewal/roles/send-template/meta/main.yml deleted file mode 100644 index f043c64f..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/meta/main.yml +++ /dev/null @@ -1,60 +0,0 @@ -galaxy_info: - author: your name - description: your description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Some suggested licenses: - # - BSD (default) - # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY - license: license (GPLv2, CC-BY, etc) - - min_ansible_version: "2.4" - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (usually master) will be used. - # github_branch: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/ibm_concert/cert_renewal/roles/send-template/tasks/main.yml b/ibm_concert/cert_renewal/roles/send-template/tasks/main.yml deleted file mode 100644 index e5edfdba..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -############################################################################### -# © Copyright IBM Corporation 2024 -############################################################################### - -# tasks file for send-template -- name: Send template - ansible.builtin.template: - src: '{{ path }}' - dest: '{{ uss_file_path }}/{{ path | basename }}' - -- name: Encode all template files - ansible.builtin.shell: iconv -f ISO8859-1 -t IBM-1047 {{ path | basename }} > {{ path | basename }}1; chtag -tc IBM-1047 {{ path | basename }}1; mv {{ path | basename }}1 {{ path | basename }} - args: - chdir: '{{ uss_file_path }}' diff --git a/ibm_concert/cert_renewal/roles/send-template/vars/main.yml b/ibm_concert/cert_renewal/roles/send-template/vars/main.yml deleted file mode 100644 index 692baf9e..00000000 --- a/ibm_concert/cert_renewal/roles/send-template/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for send-template diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 7ff2032d..894bac0a 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -6,13 +6,20 @@ gather_facts: false environment: "{{ environment_vars }}" vars: - # IBM Concert variables - concert_hostname: '' - concert_instance_id: '' - concert_api_key: '' - concert_api_key_type: '' + # IBM Concert info + concert_hostname: "93252.us-south-8.concert.saas.ibm.com" + concert_instance_id: "20241004-1336-0851-0172-bdce0ebbebf7" + concert_api_key: "YW5keS5uZ3V5ZW5AaWJtLmNvbTo4ZjRlMTZhYS0xN2RiLTQ5YWYtOTczOS1lZWEyZGFlOTY4ODQ=" + concert_api_key_type: "C_API_KEY" concert_csv_file: "zos-cert-data.csv" + # IBM Concert variables + # concert_hostname: '' + # concert_instance_id: '' + # concert_api_key: '' + # concert_api_key_type: '' + # concert_csv_file: "zos-cert-data.csv" + # variables for cert data owner_id: '' cert_type: '' @@ -35,23 +42,18 @@ register: playbook_tmp_dir - block: - - ansible.builtin.include_role: - name: issue_operator_cmd - vars: - task_description: 'Run Health Checker' - command: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" + - name: Run Health Checker + ibm.ibm_zos_core.zos_operator: + cmd: "F HZSPROC,RUN,CHECK=(IBMRACF,RACF_CERTIFICATE_EXPIRATION)" + register: zos_operator_output - - name: Get expiring certs report for {{ hc_check }} + - name: Get expiring certs report from IBMRACF,RACF_CERTIFICATE_EXPIRATION ibm.ibm_zos_core.zos_job_submit: src: '{{ playbook_dir }}/HZSPRINT.J2' location: local use_template: true - register: hc_job_output - # - ansible.builtin.include_role: - # name: print_hc_buffer - # vars: - # hc_check: 'IBMRACF,RACF_CERTIFICATE_EXPIRATION' + register: hc_job_output - name: Get report lines ansible.builtin.set_fact: @@ -78,25 +80,26 @@ 'cert_type': 'USER', 'cert_label': item[16:48]}]}}" loop: "{{report_lines}}" - when: item is search('E ID') - - - name: Search for CERTAUTH in report - ansible.builtin.set_fact: - expiring_certs: "{{ expiring_certs | default([]) + [{ - 'owner_id': '', - 'cert_type': 'CERTAUTH', - 'cert_label': item[16:48]}]}}" - loop: "{{report_lines}}" - when: item is search('CERTAUTH') - - - name: Search for SITE in report - ansible.builtin.set_fact: - expiring_certs: "{{ expiring_certs | default([]) + [{ - 'owner_id': '', - 'cert_type': 'SITE', - 'cert_label': item[16:48]}]}}" - loop: '{{report_lines}}' - when: item is search('SITE') + when: item is search('STCUSR') + # when: item is search('E ID') + + # - name: Search for CERTAUTH in report + # ansible.builtin.set_fact: + # expiring_certs: "{{ expiring_certs | default([]) + [{ + # 'owner_id': '', + # 'cert_type': 'CERTAUTH', + # 'cert_label': item[16:48]}]}}" + # loop: "{{report_lines}}" + # when: item is search('CERTAUTH') + + # - name: Search for SITE in report + # ansible.builtin.set_fact: + # expiring_certs: "{{ expiring_certs | default([]) + [{ + # 'owner_id': '', + # 'cert_type': 'SITE', + # 'cert_label': item[16:48]}]}}" + # loop: '{{report_lines}}' + # when: item is search('SITE') - ansible.builtin.debug: msg: "Num of expiring certs: {{expiring_certs | length}}" From efa0c6e07c43fcd9a884bbdf8308ae248836aae5 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:14:51 -0700 Subject: [PATCH 04/10] remove comments Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml | 2 -- 1 file changed, 2 deletions(-) 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 9df57ba1..f354dc32 100644 --- a/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml +++ b/ibm_concert/cert_renewal/inventories/host_vars/zos_host.yml @@ -24,8 +24,6 @@ ZOAU: "path_to_zoau" ################################################################################ ansible_python_interpreter: "{{ PYZ }}/bin/python3" - # //HZSPRINT JOB 'IMS SYSTEM', - # // NOTIFY=&SYSUID # varibles for templates JOB_CARD: |- //HZSPRINT JOB , From 65a6dcbf29bcfa8ef754d6ac4d3552da20f2ca20 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:19:00 -0700 Subject: [PATCH 05/10] fix ansible-lint error Signed-off-by: Andrew Nguyen --- collections/requirements.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 collections/requirements.yml diff --git a/collections/requirements.yml b/collections/requirements.yml new file mode 100644 index 00000000..2d8c000b --- /dev/null +++ b/collections/requirements.yml @@ -0,0 +1,24 @@ +################################################################################ +# Copyright (c) IBM Corporation 2020, 2023 +################################################################################ +# This file is required when using repository directly in AWX/Tower +# for more info: https://docs.ansible.com/ansible/latest/user_guide/collections_using.html#install-multiple-collections-with-a-requirements-file +# https://docs.ansible.com/ansible-tower/latest/html/userguide/projects.html#collections-support +--- +collections: + - name: ibm.ibm_zhmc + version: 1.2.1 + - name: ibm.ibm_zos_cics + version: 2.1.0 + - name: ibm.ibm_zos_core + version: 1.8.0-beta.1 + - name: ibm.ibm_zos_ims + version: 1.1.0 + - name: ibm.ibm_zosmf + version: 1.3.0 + - name: community.general + version: 6.5.0 + - name: openstack.cloud + version: 1.10.0 + - name: servicenow.itsm + version: 2.7.0 From 872969684d16902037b3dcc2199d8959da0373c1 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:25:13 -0700 Subject: [PATCH 06/10] remove test data Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/renew_cert.yml | 18 +++++++++--------- ibm_concert/cert_renewal/send_cert_data.yml | 6 ------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index 112bba0a..ef70586c 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -7,17 +7,17 @@ environment: "{{ environment_vars }}" vars: # ServiceNow info - sn_hostname: "https://ibmglobalservicesdemo50.service-now.com/" - sn_username: "andyn" - sn_pwd: "ypc1cgt6PMJ5bdx@jfh" - sn_incident_number: "INC0010087" - sn_short_desc: "INC0010089@@@[From: IBM Concert] [Environment: prod] Certificate @@@STCUSR@@@concertCertificateTest2@@@ expires in about 1 year" + sn_hostname: "" + sn_username: "" + sn_pwd: "" + sn_incident_number: "" + sn_short_desc: "" # IBM Concert info - concert_hostname: "93252.us-south-8.concert.saas.ibm.com" - concert_instance_id: "20241004-1336-0851-0172-bdce0ebbebf7" - concert_api_key: "YW5keS5uZ3V5ZW5AaWJtLmNvbTo4ZjRlMTZhYS0xN2RiLTQ5YWYtOTczOS1lZWEyZGFlOTY4ODQ=" - concert_api_key_type: "C_API_KEY" + concert_hostname: "" + concert_instance_id: "" + concert_api_key: "" + concert_api_key_type: "" concert_csv_file: "zos-cert-data.csv" # variables for cert renewal logic diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 894bac0a..5ccf99b7 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -6,12 +6,6 @@ gather_facts: false environment: "{{ environment_vars }}" vars: - # IBM Concert info - concert_hostname: "93252.us-south-8.concert.saas.ibm.com" - concert_instance_id: "20241004-1336-0851-0172-bdce0ebbebf7" - concert_api_key: "YW5keS5uZ3V5ZW5AaWJtLmNvbTo4ZjRlMTZhYS0xN2RiLTQ5YWYtOTczOS1lZWEyZGFlOTY4ODQ=" - concert_api_key_type: "C_API_KEY" - concert_csv_file: "zos-cert-data.csv" # IBM Concert variables # concert_hostname: '' From f3e98fefa70f1cdba34133fa4dd29c795f3393e3 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:30:05 -0700 Subject: [PATCH 07/10] fix zos_tos_command syntax Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/renew_cert.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ibm_concert/cert_renewal/renew_cert.yml b/ibm_concert/cert_renewal/renew_cert.yml index ef70586c..0767fc4f 100644 --- a/ibm_concert/cert_renewal/renew_cert.yml +++ b/ibm_concert/cert_renewal/renew_cert.yml @@ -170,7 +170,7 @@ - name: Back up current certificate ibm.ibm_zos_core.zos_tso_command: - command: + commands: - RACDCERT EXPORT(LABEL('{{cert_label}}')) ID({{owner_id}}) DSN('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') - RACDCERT CHECKCERT('{{ ansible_user }}.CERT.{{cert_type}}.BACKUP.{{today}}') ID({{owner_id}}) when: cert_type == 'USER' @@ -181,7 +181,7 @@ - name: Rekey and Generate new cert request for {{cert_type}} ibm.ibm_zos_core.zos_tso_command: - command: + commands: - RACDCERT {{cert_type}} REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT {{cert_type}} ROLLOVER(LABEL('{{cert_label}}')) NEWLABEL('{{cert_label[:-3]}}{{random_str}}') - RACDCERT {{cert_type}} LIST(LABEL('{{cert_label[:-3]}}{{random_str}}')) @@ -192,7 +192,7 @@ - name: Rekey and Generate new cert request for {{cert_type}} ibm.ibm_zos_core.zos_tso_command: - command: + commands: - RACDCERT {{cert_type}} REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT {{cert_type}} GENREQ (LABEL('{{cert_label[:-3]}}{{random_str}}')) DSN('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') - RACDCERT {{cert_type}} GENCERT('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') SIGNWITH({{sign_with}} LABEL('{{cert_args.cert_signer}}')) NOTAFTER(DATE({{expiry_date}})) @@ -205,7 +205,7 @@ - name: Rekey and Generate new cert request for {{cert_type}} ibm.ibm_zos_core.zos_tso_command: - command: + commands: - RACDCERT ID({{owner_id}}) REKEY(LABEL('{{cert_label}}')) WITHLABEL('{{cert_label[:-3]}}{{random_str}}') NOTAFTER(DATE({{expiry_date}})) - RACDCERT ID({{owner_id}}) GENREQ (LABEL('{{cert_label[:-3]}}{{random_str}}')) DSN('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') - RACDCERT ID({{owner_id}}) GENCERT('{{ ansible_user }}.CSR.{{cert_type}}.{{today}}') SIGNWITH({{sign_with}} LABEL('{{cert_args.cert_signer}}')) NOTAFTER(DATE({{expiry_date}})) From ec8027ceddb72e36bece5845218ee16ef9ada40a Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:31:04 -0700 Subject: [PATCH 08/10] query all expired certs Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/send_cert_data.yml | 39 ++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 5ccf99b7..5fc65dfa 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -74,26 +74,25 @@ 'cert_type': 'USER', 'cert_label': item[16:48]}]}}" loop: "{{report_lines}}" - when: item is search('STCUSR') - # when: item is search('E ID') - - # - name: Search for CERTAUTH in report - # ansible.builtin.set_fact: - # expiring_certs: "{{ expiring_certs | default([]) + [{ - # 'owner_id': '', - # 'cert_type': 'CERTAUTH', - # 'cert_label': item[16:48]}]}}" - # loop: "{{report_lines}}" - # when: item is search('CERTAUTH') - - # - name: Search for SITE in report - # ansible.builtin.set_fact: - # expiring_certs: "{{ expiring_certs | default([]) + [{ - # 'owner_id': '', - # 'cert_type': 'SITE', - # 'cert_label': item[16:48]}]}}" - # loop: '{{report_lines}}' - # when: item is search('SITE') + when: item is search('E ID') + + - name: Search for CERTAUTH in report + ansible.builtin.set_fact: + expiring_certs: "{{ expiring_certs | default([]) + [{ + 'owner_id': '', + 'cert_type': 'CERTAUTH', + 'cert_label': item[16:48]}]}}" + loop: "{{report_lines}}" + when: item is search('CERTAUTH') + + - name: Search for SITE in report + ansible.builtin.set_fact: + expiring_certs: "{{ expiring_certs | default([]) + [{ + 'owner_id': '', + 'cert_type': 'SITE', + 'cert_label': item[16:48]}]}}" + loop: '{{report_lines}}' + when: item is search('SITE') - ansible.builtin.debug: msg: "Num of expiring certs: {{expiring_certs | length}}" From 2222e8813e8c7ba82a445484a93b6f2cbbdd145a Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Fri, 1 Nov 2024 17:33:28 -0700 Subject: [PATCH 09/10] fix concert variables Signed-off-by: Andrew Nguyen --- ibm_concert/cert_renewal/send_cert_data.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ibm_concert/cert_renewal/send_cert_data.yml b/ibm_concert/cert_renewal/send_cert_data.yml index 5fc65dfa..383bd28a 100644 --- a/ibm_concert/cert_renewal/send_cert_data.yml +++ b/ibm_concert/cert_renewal/send_cert_data.yml @@ -8,11 +8,11 @@ vars: # IBM Concert variables - # concert_hostname: '' - # concert_instance_id: '' - # concert_api_key: '' - # concert_api_key_type: '' - # concert_csv_file: "zos-cert-data.csv" + concert_hostname: '' + concert_instance_id: '' + concert_api_key: '' + concert_api_key_type: '' + concert_csv_file: "zos-cert-data.csv" # variables for cert data owner_id: '' From cb265ef70de59e859e6617ed107a73dbbde93cf1 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 4 Nov 2024 10:51:10 -0800 Subject: [PATCH 10/10] add collections dir back Signed-off-by: Andrew Nguyen --- collections_old/requirements.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 collections_old/requirements.yml diff --git a/collections_old/requirements.yml b/collections_old/requirements.yml deleted file mode 100644 index 2d8c000b..00000000 --- a/collections_old/requirements.yml +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# Copyright (c) IBM Corporation 2020, 2023 -################################################################################ -# This file is required when using repository directly in AWX/Tower -# for more info: https://docs.ansible.com/ansible/latest/user_guide/collections_using.html#install-multiple-collections-with-a-requirements-file -# https://docs.ansible.com/ansible-tower/latest/html/userguide/projects.html#collections-support ---- -collections: - - name: ibm.ibm_zhmc - version: 1.2.1 - - name: ibm.ibm_zos_cics - version: 2.1.0 - - name: ibm.ibm_zos_core - version: 1.8.0-beta.1 - - name: ibm.ibm_zos_ims - version: 1.1.0 - - name: ibm.ibm_zosmf - version: 1.3.0 - - name: community.general - version: 6.5.0 - - name: openstack.cloud - version: 1.10.0 - - name: servicenow.itsm - version: 2.7.0