From ae3fe9817fd570514e68c21264ed86321beee12c Mon Sep 17 00:00:00 2001
From: Alex Dworjan <adworjan@redhat.com>
Date: Fri, 16 Aug 2024 10:50:05 -0400
Subject: [PATCH] fixed conditionals

---
 .ansible-sign/sha256sum.txt                   |  3 +--
 .ansible-sign/sha256sum.txt.sig               | 22 +++++++++----------
 ServiceNowCR_closed_cr.yml                    | 11 ----------
 .../servicenow_change_request/tasks/main.yml  |  3 ++-
 4 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 ServiceNowCR_closed_cr.yml

diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt
index 8b6fa2b..e6381cf 100644
--- a/.ansible-sign/sha256sum.txt
+++ b/.ansible-sign/sha256sum.txt
@@ -99,7 +99,6 @@ b8bc0e6865c91d1d8cedf5bc9faa24782629806c15f99d0b24e3397ec294dcbb  SNOWSetup/imag
 8d64a90e1cf927f9adf8074d405a62ec50f4df417865706d1f4bc5ff5bdfeaa5  ServiceNowCR_and_approve.yml
 db0cf6bab374ea48077c3898aea1602a570541a49ed82797b7459c9ce9a9824c  ServiceNowCR_canceled.yml
 675d62c62ed528e495f8144290d181875521766c5cebb9661fc15552f1db1083  ServiceNowCR_closed.yml
-253dfb0b9ff1fed18ce2a9c3bda1538b76ad98c7ac3e26ba9c65cc03e38b11d8  ServiceNowCR_closed_cr.yml
 874cbddd96b4a29ba61d770da124c9db0ff1cc2736a1d802c9aeebbc7ffe45b1  ServiceNowCR_create.yml
 115f1fb0355698a830ed0d070a0d404d299633261364f38e4dc329811ee3c375  ServiceNowCR_deleted.yml
 97c831eff1abac9212abac46eb8922f93ecc8a3e092e0bd8545cb183fd30bff6  ServiceNowCR_implement.yml
@@ -119,7 +118,7 @@ d8d966ccdf1e73840974c82ced8da6002e81ecd1c7a94250401f9d2441778dd0  ServiceNowtick
 f8f63300d2a511a2497b34ee831c4bec65d79f7780d2cc52989c977e4018698b  roles/servicenow_catalog/tasks/main.yml
 ee48964111304a0741dcdad36426967a1784a923eba8dbea9622089072b7d52f  roles/servicenow_catalog_create/tasks/main.yml
 dca8e6b77670bfa74e7302585937d64975a04bd09381c126d683d73fa7fd94c5  roles/servicenow_change_request/defaults/main.yml
-d5a0d69f6df74093bf6017cdad91af19b6397523f7a3beb647afe09e783fba17  roles/servicenow_change_request/tasks/main.yml
+5af0ae62a8d7097af67c55c0d31ebe6d4e28e0d2b547fc849b11dbc77b69527a  roles/servicenow_change_request/tasks/main.yml
 a3dc6c14a17f1d5b86f466016d23278f80b334c28b84a73d1671255af0cd57ac  roles/servicenow_change_request/tasks/servicenow_canceled.yml
 6e7ecd69274eacded20c661ff3b50567fbf1fe4b0c62138480815783f3566603  roles/servicenow_change_request/tasks/servicenow_close.yml
 66c5294682f23256b05d468300152d8d8153714e9935dbc8f971ab61482ce979  roles/servicenow_change_request/tasks/servicenow_close_cr.yml
diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig
index 3e7fa43..1c9ee27 100644
--- a/.ansible-sign/sha256sum.txt.sig
+++ b/.ansible-sign/sha256sum.txt.sig
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAma/ZnwACgkQTiIiIXrU
-DNG98gwAhs37qxh9ZLzEsmhZGp9Ek6EHRt2CkoX12mLmRhABce+ws3X7NYORygqI
-/rreeEBGIrX3uy2oJCDCkmBGNgTKF4+N6U35Zstl6YKvNQGgXcEqUUo/UOiUMRng
-Uiot0bYs+1lyX/8jMjgMPBFl5gDPd9G+X6nS3fF624B6U/MsQ8dwQQ6zl1fKuK1S
-4IGX70eAGa62fgQUODVJ/bKm5ZQrpl5RY2VFIs9HpN2mqnzKBPSLF8KGnU3T2UEC
-jMG8HEVpVUM4C1gLtEYPnFOesFRQscewJ8Kt6cTsUAHcvp6J6JBXFasjn433BXId
-0KzyJzofPcYeG/8dJ5bLnv/DwwG2cteeBYuoTe4Wzss6h0VsJB1icBLMvVhhNp11
-e4fRscYseMsxPXSucrAr3T+m1grccZrgJiz3KlOS71BhUnGVV6rK/OItVA8hMIdy
-C7l757GGpDIOaC5CMspJuRv1mIUDq/EMJrLQ3NeOavBd3YS4ourTnIE2UvSdKhC0
-jM9tkdSW
-=CkTo
+iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAma/ZwwACgkQTiIiIXrU
+DNEQRQwAs/qZQcGsQsk6pP3tSZJpp3Fnx2SnbCMbh9tTXugdul/PzCg9AVo/q0DD
+7Wf5JE007EgOdq7/lfY7ce0hKECli9r6s1WV8Kk8Eq/kocDtlGT2fbCL7s+nf7qX
+ASZgJC0PCFOsJ6aSuyLWrynfhgIFMGlOp23IX4fj8s/3d1JwU9eRigcsTghZQ92b
+8hJ83+WdYBtDFu892+I6ih5YeLbo0bcU7KmKvGKj0bIUTUNe7QkssgaM0ZHluBgY
++Vq+Ingjji9PDpKwwBoDuahwW/JjNjtCIbxTU7letjoJ0LGXlJisOdIQmE6nOqpz
+HfcWshhioV6dUNXIgxV+9xEq5BLwnrlCfFjwi1jABqQDzZnL9QbSc2VTLMno+Vqm
+lH8RrGyNr6l80CQVtV+lrgMnmc4SaQDpc7ipZy0cVKs0ZBkI/4Ga24fl7TmDSH3+
+pvU6CpxK+KaQ8r5FHc/j7IfjfjwUKCZ99ha4Rb0K4wtxq1fnjUYD0q7up0PtNVQh
+M2P+sHXE
+=SKWH
 -----END PGP SIGNATURE-----
diff --git a/ServiceNowCR_closed_cr.yml b/ServiceNowCR_closed_cr.yml
deleted file mode 100644
index ed1cc7d..0000000
--- a/ServiceNowCR_closed_cr.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Close a change request from Flow Designer Driven
-  hosts: localhost
-  gather_facts: false
-  connection: local
-
-  vars:
-    servicenow_cr: close_cr
-
-  roles:
-    - servicenow_change_request
diff --git a/roles/servicenow_change_request/tasks/main.yml b/roles/servicenow_change_request/tasks/main.yml
index cfd4833..fd54a61 100644
--- a/roles/servicenow_change_request/tasks/main.yml
+++ b/roles/servicenow_change_request/tasks/main.yml
@@ -19,7 +19,8 @@
 - name: Close CR
   ansible.builtin.include_tasks: servicenow_close_cr.yml
   when:
-    - servicenow_cr == "close_cr"
+    - servicenow_cr == "close"
+    - change_request_number is defined
 
 - name: Cancel CR
   ansible.builtin.include_tasks: servicenow_canceled.yml