Merge branch 'devel' into feature_constructed-inventory

awx_collection/plugins/modules/ad_hoc_command.py

@@ -123,7 +123,7 @@ def main():
         module_name=dict(required=True),
         module_args=dict(),
         forks=dict(type='int'),
-        verbosity=dict(type='int', choices=['0', '1', '2', '3', '4', '5']),
+        verbosity=dict(type='int', choices=[0, 1, 2, 3, 4, 5]),
         extra_vars=dict(type='dict'),
         become_enabled=dict(type='bool'),
         diff_mode=dict(type='bool'),

awx_collection/plugins/modules/tower_ad_hoc_command.py

@@ -1 +0,0 @@
-ad_hoc_command.py

awx_collection/plugins/modules/tower_ad_hoc_command_cancel.py

@@ -1 +0,0 @@
-ad_hoc_command_cancel.py

awx_collection/plugins/modules/tower_ad_hoc_command_wait.py

@@ -1 +0,0 @@
-ad_hoc_command_wait.py

awx_collection/plugins/modules/tower_application.py

@@ -1 +0,0 @@
-application.py

awx_collection/plugins/modules/tower_controller_meta.py

@@ -1 +0,0 @@
-controller_meta.py

awx_collection/plugins/modules/tower_credential.py

@@ -1 +0,0 @@
-credential.py

awx_collection/plugins/modules/tower_credential_input_source.py

@@ -1 +0,0 @@
-credential_input_source.py

awx_collection/plugins/modules/tower_credential_type.py

@@ -1 +0,0 @@
-credential_type.py

awx_collection/plugins/modules/tower_execution_environment.py

@@ -1 +0,0 @@
-execution_environment.py

awx_collection/plugins/modules/tower_export.py

@@ -1 +0,0 @@
-export.py

awx_collection/plugins/modules/tower_group.py

@@ -1 +0,0 @@
-group.py

awx_collection/plugins/modules/tower_host.py

@@ -1 +0,0 @@
-host.py

awx_collection/plugins/modules/tower_import.py

@@ -1 +0,0 @@
-import.py

awx_collection/plugins/modules/tower_instance_group.py

@@ -1 +0,0 @@
-instance_group.py

awx_collection/plugins/modules/tower_inventory.py

@@ -1 +0,0 @@
-inventory.py

awx_collection/plugins/modules/tower_inventory_source.py

@@ -1 +0,0 @@
-inventory_source.py

awx_collection/plugins/modules/tower_inventory_source_update.py

@@ -1 +0,0 @@
-inventory_source_update.py

awx_collection/plugins/modules/tower_job_cancel.py

@@ -1 +0,0 @@
-job_cancel.py

awx_collection/plugins/modules/tower_job_launch.py

@@ -1 +0,0 @@
-job_launch.py

awx_collection/plugins/modules/tower_job_list.py

@@ -1 +0,0 @@
-job_list.py

awx_collection/plugins/modules/tower_job_template.py

@@ -1 +0,0 @@
-job_template.py

awx_collection/plugins/modules/tower_job_wait.py

@@ -1 +0,0 @@
-job_wait.py

awx_collection/plugins/modules/tower_label.py

@@ -1 +0,0 @@
-label.py

awx_collection/plugins/modules/tower_license.py

@@ -1 +0,0 @@
-license.py

awx_collection/plugins/modules/tower_notification_template.py

@@ -1 +0,0 @@
-notification_template.py

awx_collection/plugins/modules/tower_organization.py

@@ -1 +0,0 @@
-organization.py

awx_collection/plugins/modules/tower_project.py

@@ -1 +0,0 @@
-project.py

awx_collection/plugins/modules/tower_project_update.py

@@ -1 +0,0 @@
-project_update.py

awx_collection/plugins/modules/tower_role.py

@@ -1 +0,0 @@
-role.py

awx_collection/plugins/modules/tower_schedule.py

@@ -1 +0,0 @@
-schedule.py

awx_collection/plugins/modules/tower_settings.py

@@ -1 +0,0 @@
-settings.py

awx_collection/plugins/modules/tower_team.py

@@ -1 +0,0 @@
-team.py

awx_collection/plugins/modules/tower_token.py

@@ -1 +0,0 @@
-token.py

awx_collection/plugins/modules/tower_user.py

@@ -1 +0,0 @@
-user.py

awx_collection/plugins/modules/tower_workflow_approval.py

@@ -1 +0,0 @@
-workflow_approval.py

awx_collection/plugins/modules/tower_workflow_job_template.py

@@ -1 +0,0 @@
-workflow_job_template.py

awx_collection/plugins/modules/tower_workflow_job_template_node.py

@@ -1 +0,0 @@
-workflow_job_template_node.py

awx_collection/plugins/modules/tower_workflow_launch.py

@@ -1 +0,0 @@
-workflow_launch.py

awx_collection/plugins/modules/tower_workflow_node_wait.py

@@ -1 +0,0 @@
-workflow_node_wait.py

awx_collection/plugins/modules/workflow_job_template.py

@@ -19,7 +19,6 @@ author: "John Westcott IV (@john-westcott-iv)"
 short_description: create, update, or destroy Automation Platform Controller workflow job templates.
 description:
     - Create, update, or destroy Automation Platform Controller workflow job templates.
-    - Replaces the deprecated tower_workflow_template module.
     - Use workflow_job_template_node after this, or use the workflow_nodes parameter to build the workflow's graph
 options:
     name:
@@ -614,6 +613,10 @@ def create_workflow_nodes(module, response, workflow_nodes, workflow_id):
                 if workflow_node['unified_job_template']['type'] != 'workflow_approval':
                     module.fail_json(msg="Unable to Find unified_job_template: {0}".format(search_fields))
 
+        inventory = workflow_node.get('inventory')
+        if inventory:
+            workflow_node_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)
+
         # Lookup Values for other fields
 
         for field_name in (

awx_collection/plugins/modules/workflow_job_template_node.py

@@ -20,7 +20,6 @@ short_description: create, update, or destroy Automation Platform Controller wor
 description:
     - Create, update, or destroy Automation Platform Controller workflow job template nodes.
     - Use this to build a graph for a workflow, which dictates what the workflow runs.
-    - Replaces the deprecated tower_workflow_template module schema command.
     - You can create nodes first, and link them afterwards, and not worry about ordering.
       For failsafe referencing of a node, specify identifier, WFJT, and organization.
       With those specified, you can choose to modify or not modify any other parameter.