Przeglądaj źródła

check for desired csv within entries of a channel, not just current CSV

Grega Bremec 2 tygodni temu
rodzic
commit
ddf0ffe019
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      p0f/operators/roles/fix-operators/tasks/main.yml

+ 3 - 1
p0f/operators/roles/fix-operators/tasks/main.yml

@@ -22,6 +22,7 @@
 #
 #   vrfy_cat     catalog source
 #   vrfy_pkg     operator package name
+#   vrfy_chn     channel we look in
 #   vrfy_csv     csv we look for
 #
 # NOTE: Fixing existing subscriptions, patching their catalogs, changing CSVs,
@@ -165,12 +166,13 @@
           - vrfy_mft.resources is defined
           - (vrfy_mft.resources | length) > 0
           - vrfy_mft.resources[0].status.catalogSource == vrfy_cat
-          - 'vrfy_csv in (vrfy_mft.resources[0] | community.general.json_query("status.channels[*].currentCSV") | list)'
+          - 'vrfy_csv in (vrfy_mft.resources[0] | community.general.json_query("status.channels[?name==`" + vrfy_chn + "`].entries[*].name") | list)[0]'
         fail_msg: "ERROR: {{ vrfy_pkg }} package manifest not deployed correctly."
         success_msg: "OK: {{ vrfy_pkg }} package manifest configured correctly."
 
   when:
     - vrfy_cat is defined
     - vrfy_pkg is defined
+    - vrfy_chn is defined
     - vrfy_csv is defined
 ...