trying to fix some messed up vars (#1171)

* trying to fix some messed up vars

* typo, for #1170

* new file:   changelogs/fragments/workflow_jt_vars.yml

Author: djdanielsson

changelogs/fragments/workflow_jt_vars.yml

@@ -0,0 +1,6 @@
+---
+bugfixes:
+  - changing `workflow_job_templates_secure_logging` to fit standard `controller_configuration_workflow_job_templates_secure_logging`
+  - fixing `workflow_job_templates_async_delay` to what it was supposed to be `controller_configuration_workflow_async_delay`
+  - fixing `workflow_job_templates_async_retries` to what it was supposed to be controller_configuration_workflow_async_retries`
+...

roles/controller_workflow_job_templates/README.md

@@ -43,11 +43,11 @@ Enabling this will enforce configuration without specifying every option in the
 The following Variables compliment each other.
 If Both variables are not set, secure logging defaults to false.
 The role defaults to false as normally the add Workflow Job Templates task does not include sensitive information.
-workflow_job_templates_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of genie roles with a single variable, or for the user to selectively use it.
+controller_configuration_workflow_job_templates_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of genie roles with a single variable, or for the user to selectively use it.
 
 |Variable Name|Default Value|Required|Description|
 |:---:|:---:|:---:|:---:|
-|`workflow_job_templates_secure_logging`|`false`|no|Whether or not to include the sensitive Workflow Job Templates role tasks in the log. Set this value to `true` if you will be providing your sensitive values from elsewhere.|
+|`controller_configuration_workflow_job_templates_secure_logging`|`false`|no|Whether or not to include the sensitive Workflow Job Templates role tasks in the log. Set this value to `true` if you will be providing your sensitive values from elsewhere.|
 |`aap_configuration_secure_logging`|`false`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.|
 
 ### Asynchronous Retry Variables

roles/controller_workflow_job_templates/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 # list of dicts describing Controller workflow templates
 controller_workflows: []
-workflow_job_templates_secure_logging: "{{ aap_configuration_secure_logging | default('false') }}"
+controller_configuration_workflow_job_templates_secure_logging: "{{ aap_configuration_secure_logging | default('false') }}"
 controller_configuration_workflow_async_retries: "{{ aap_configuration_async_retries | default(30) }}"
 controller_configuration_workflow_async_delay: "{{ aap_configuration_async_delay | default(1) }}"
 controller_configuration_workflow_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}"

roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml

@@ -2,7 +2,7 @@
 - name: add_workflows_schema | Manage Controller Workflow Nodes Block
   vars:
     ansible_async_dir: "{{ aap_configuration_async_dir }}"
-  no_log: "{{ workflow_job_templates_secure_logging }}"
+  no_log: "{{ controller_configuration_workflow_job_templates_secure_logging }}"
   block:
     # Creating Workflow Node
     - name: add_workflows_schema | Create the Workflow Nodes
@@ -65,9 +65,9 @@
       loop_control:
         loop_var: __workflows_node_async_results_item
       vars:
-        cas_secure_logging: "{{ workflow_job_templates_secure_logging }}"
-        cas_async_delay: "{{ workflow_job_templates_async_delay }}"
-        cas_async_retries: "{{ workflow_job_templates_async_retries }}"
+        cas_secure_logging: "{{ controller_configuration_workflow_job_templates_secure_logging }}"
+        cas_async_delay: "{{ controller_configuration_workflow_async_delay }}"
+        cas_async_retries: "{{ controller_configuration_workflow_async_retries }}"
         cas_job_async_results_item: "{{ __workflows_node_async_results_item }}"
         cas_error_list_var_name: "controller_workflows_errors"
 
@@ -120,9 +120,9 @@
       loop_control:
         loop_var: __workflows_link_async_results_item
       vars:
-        cas_secure_logging: "{{ workflow_job_templates_secure_logging }}"
-        cas_async_delay: "{{ workflow_job_templates_async_delay }}"
-        cas_async_retries: "{{ workflow_job_templates_async_retries }}"
+        cas_secure_logging: "{{ controller_configuration_workflow_job_templates_secure_logging }}"
+        cas_async_delay: "{{ controller_configuration_workflow_async_delay }}"
+        cas_async_retries: "{{ controller_configuration_workflow_async_retries }}"
         cas_job_async_results_item: "{{ __workflows_link_async_results_item }}"
         cas_error_list_var_name: "controller_workflows_errors"
 

roles/controller_workflow_job_templates/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Manage Controller Workflows Block
   vars:
     ansible_async_dir: "{{ aap_configuration_async_dir }}"
-  no_log: "{{ workflow_job_templates_secure_logging }}"
+  no_log: "{{ controller_configuration_workflow_job_templates_secure_logging }}"
   block:
     # Create links between workflow node
     - name: Loop over nodes in schema to add to workflow templates
@@ -83,9 +83,9 @@
         loop_var: __workflows_job_async_results_item
         label: "{{ __operation.verb }} Workflow {{ __workflows_job_async_results_item.__workflow_loop_item.name }} | Wait for finish the workflow {{ __operation.action }}"
       vars:
-        cas_secure_logging: "{{ workflow_job_templates_secure_logging }}"
-        cas_async_delay: "{{ workflow_job_templates_async_delay }}"
-        cas_async_retries: "{{ workflow_job_templates_async_retries }}"
+        cas_secure_logging: "{{ controller_configuration_workflow_job_templates_secure_logging }}"
+        cas_async_delay: "{{ controller_configuration_workflow_job_templates_async_delay }}"
+        cas_async_retries: "{{ controller_configuration_workflow_job_templates_async_retries }}"
         cas_job_async_results_item: "{{ __workflows_job_async_results_item }}"
         cas_error_list_var_name: "controller_workflows_errors"
         __operation: "{{ operation_translate[__workflows_job_async_results_item.__workflow_loop_item.state | default(platform_state) | default('present')] }}"

tests/configure_controller_export_model.yml

@@ -3,7 +3,7 @@
   hosts: localhost
   connection: local
   vars:
-    workflow_job_templates_secure_logging: false
+    controller_configuration_workflow_job_templates_secure_logging: false
     aap_validate_certs: false
   # Define following vars here, or in configs/controller_auth.yml
   # aap_hostname: controller.example.com