mirror of
https://github.com/ansible/awx.git
synced 2026-05-15 05:17:36 -02:30
Merge branch 'devel' into feature_constructed-inventory
This commit is contained in:
Hao Liu
@@ -46,90 +46,216 @@ action_groups:
|
||||
plugin_routing:
|
||||
inventory:
|
||||
tower:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* plugins have been deprecated, use awx.awx.controller instead.
|
||||
redirect: awx.awx.controller
|
||||
lookup:
|
||||
tower_api:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* plugins have been deprecated, use awx.awx.controller_api instead.
|
||||
redirect: awx.awx.controller_api
|
||||
tower_schedule_rrule:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* plugins have been deprecated, use awx.awx.schedule_rrule instead.
|
||||
redirect: awx.awx.schedule_rrule
|
||||
modules:
|
||||
tower_ad_hoc_command_cancel:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.ad_hoc_command_cancel instead.
|
||||
redirect: awx.awx.ad_hoc_command_cancel
|
||||
tower_ad_hoc_command_wait:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.ad_hoc_command_wait instead.
|
||||
redirect: awx.awx.ad_hoc_command_wait
|
||||
tower_ad_hoc_command:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.ad_hoc_command instead.
|
||||
redirect: awx.awx.ad_hoc_command
|
||||
tower_application:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.application instead.
|
||||
redirect: awx.awx.application
|
||||
tower_meta:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.controller_meta instead.
|
||||
redirect: awx.awx.controller_meta
|
||||
tower_credential_input_source:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.credential_input_source instead.
|
||||
redirect: awx.awx.credential_input_source
|
||||
tower_credential_type:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.credential_type instead.
|
||||
redirect: awx.awx.credential_type
|
||||
tower_credential:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.credential instead.
|
||||
redirect: awx.awx.credential
|
||||
tower_execution_environment:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.execution_environment instead.
|
||||
redirect: awx.awx.execution_environment
|
||||
tower_export:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.export instead.
|
||||
redirect: awx.awx.export
|
||||
tower_group:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.group instead.
|
||||
redirect: awx.awx.group
|
||||
tower_host:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.host instead.
|
||||
redirect: awx.awx.host
|
||||
tower_import:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.import instead.
|
||||
redirect: awx.awx.import
|
||||
tower_instance_group:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.instance_group instead.
|
||||
redirect: awx.awx.instance_group
|
||||
tower_inventory_source_update:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.inventory_source_update instead.
|
||||
redirect: awx.awx.inventory_source_update
|
||||
tower_inventory_source:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.inventory_source instead.
|
||||
redirect: awx.awx.inventory_source
|
||||
tower_inventory:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.inventory instead.
|
||||
redirect: awx.awx.inventory
|
||||
tower_job_cancel:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.job_cancel instead.
|
||||
redirect: awx.awx.job_cancel
|
||||
tower_job_launch:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.job_launch instead.
|
||||
redirect: awx.awx.job_launch
|
||||
tower_job_list:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.job_list instead.
|
||||
redirect: awx.awx.job_list
|
||||
tower_job_template:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.job_template instead.
|
||||
redirect: awx.awx.job_template
|
||||
tower_job_wait:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.job_wait instead.
|
||||
redirect: awx.awx.job_wait
|
||||
tower_label:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.label instead.
|
||||
redirect: awx.awx.label
|
||||
tower_license:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.license instead.
|
||||
redirect: awx.awx.license
|
||||
tower_notification_template:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.notification_template instead.
|
||||
redirect: awx.awx.notification_template
|
||||
tower_notification:
|
||||
redirect: awx.awx.notification_template
|
||||
tower_organization:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.organization instead.
|
||||
redirect: awx.awx.organization
|
||||
tower_project_update:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.project_update instead.
|
||||
redirect: awx.awx.project_update
|
||||
tower_project:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.project instead.
|
||||
redirect: awx.awx.project
|
||||
tower_role:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.role instead.
|
||||
redirect: awx.awx.role
|
||||
tower_schedule:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.schedule instead.
|
||||
redirect: awx.awx.schedule
|
||||
tower_settings:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.settings instead.
|
||||
redirect: awx.awx.settings
|
||||
tower_team:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.team instead.
|
||||
redirect: awx.awx.team
|
||||
tower_token:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.token instead.
|
||||
redirect: awx.awx.token
|
||||
tower_user:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.user instead.
|
||||
redirect: awx.awx.user
|
||||
tower_workflow_approval:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.workflow_approval instead.
|
||||
redirect: awx.awx.workflow_approval
|
||||
tower_workflow_job_template_node:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.workflow_job_template_node instead.
|
||||
redirect: awx.awx.workflow_job_template_node
|
||||
tower_workflow_job_template:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.workflow_job_template instead.
|
||||
redirect: awx.awx.workflow_job_template
|
||||
tower_workflow_launch:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.workflow_launch instead.
|
||||
redirect: awx.awx.workflow_launch
|
||||
tower_workflow_node_wait:
|
||||
deprecation:
|
||||
removal_date: '2022-01-23'
|
||||
warning_text: The tower_* modules have been deprecated, use awx.awx.workflow_node_wait instead.
|
||||
redirect: awx.awx.workflow_node_wait
|
||||
|
||||
@@ -147,34 +147,34 @@ class LookupModule(LookupBase):
|
||||
def __init__(self, *args, **kwargs):
|
||||
if LIBRARY_IMPORT_ERROR:
|
||||
raise_from(AnsibleError('{0}'.format(LIBRARY_IMPORT_ERROR)), LIBRARY_IMPORT_ERROR)
|
||||
super().__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
self.frequencies = {
|
||||
'none': rrule.DAILY,
|
||||
'minute': rrule.MINUTELY,
|
||||
'hour': rrule.HOURLY,
|
||||
'day': rrule.DAILY,
|
||||
'week': rrule.WEEKLY,
|
||||
'month': rrule.MONTHLY,
|
||||
}
|
||||
self.frequencies = {
|
||||
'none': rrule.DAILY,
|
||||
'minute': rrule.MINUTELY,
|
||||
'hour': rrule.HOURLY,
|
||||
'day': rrule.DAILY,
|
||||
'week': rrule.WEEKLY,
|
||||
'month': rrule.MONTHLY,
|
||||
}
|
||||
|
||||
self.weekdays = {
|
||||
'monday': rrule.MO,
|
||||
'tuesday': rrule.TU,
|
||||
'wednesday': rrule.WE,
|
||||
'thursday': rrule.TH,
|
||||
'friday': rrule.FR,
|
||||
'saturday': rrule.SA,
|
||||
'sunday': rrule.SU,
|
||||
}
|
||||
self.weekdays = {
|
||||
'monday': rrule.MO,
|
||||
'tuesday': rrule.TU,
|
||||
'wednesday': rrule.WE,
|
||||
'thursday': rrule.TH,
|
||||
'friday': rrule.FR,
|
||||
'saturday': rrule.SA,
|
||||
'sunday': rrule.SU,
|
||||
}
|
||||
|
||||
self.set_positions = {
|
||||
'first': 1,
|
||||
'second': 2,
|
||||
'third': 3,
|
||||
'fourth': 4,
|
||||
'last': -1,
|
||||
}
|
||||
self.set_positions = {
|
||||
'first': 1,
|
||||
'second': 2,
|
||||
'third': 3,
|
||||
'fourth': 4,
|
||||
'last': -1,
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def parse_date_time(date_string):
|
||||
|
||||
@@ -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'),
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
ad_hoc_command.py
|
||||
@@ -1 +0,0 @@
|
||||
ad_hoc_command_cancel.py
|
||||
@@ -1 +0,0 @@
|
||||
ad_hoc_command_wait.py
|
||||
@@ -1 +0,0 @@
|
||||
application.py
|
||||
@@ -1 +0,0 @@
|
||||
controller_meta.py
|
||||
@@ -1 +0,0 @@
|
||||
credential.py
|
||||
@@ -1 +0,0 @@
|
||||
credential_input_source.py
|
||||
@@ -1 +0,0 @@
|
||||
credential_type.py
|
||||
@@ -1 +0,0 @@
|
||||
execution_environment.py
|
||||
@@ -1 +0,0 @@
|
||||
export.py
|
||||
@@ -1 +0,0 @@
|
||||
group.py
|
||||
@@ -1 +0,0 @@
|
||||
host.py
|
||||
@@ -1 +0,0 @@
|
||||
import.py
|
||||
@@ -1 +0,0 @@
|
||||
instance_group.py
|
||||
@@ -1 +0,0 @@
|
||||
inventory.py
|
||||
@@ -1 +0,0 @@
|
||||
inventory_source.py
|
||||
@@ -1 +0,0 @@
|
||||
inventory_source_update.py
|
||||
@@ -1 +0,0 @@
|
||||
job_cancel.py
|
||||
@@ -1 +0,0 @@
|
||||
job_launch.py
|
||||
@@ -1 +0,0 @@
|
||||
job_list.py
|
||||
@@ -1 +0,0 @@
|
||||
job_template.py
|
||||
@@ -1 +0,0 @@
|
||||
job_wait.py
|
||||
@@ -1 +0,0 @@
|
||||
label.py
|
||||
@@ -1 +0,0 @@
|
||||
license.py
|
||||
@@ -1 +0,0 @@
|
||||
notification_template.py
|
||||
@@ -1 +0,0 @@
|
||||
organization.py
|
||||
@@ -1 +0,0 @@
|
||||
project.py
|
||||
@@ -1 +0,0 @@
|
||||
project_update.py
|
||||
@@ -1 +0,0 @@
|
||||
role.py
|
||||
@@ -1 +0,0 @@
|
||||
schedule.py
|
||||
@@ -1 +0,0 @@
|
||||
settings.py
|
||||
@@ -1 +0,0 @@
|
||||
team.py
|
||||
@@ -1 +0,0 @@
|
||||
token.py
|
||||
@@ -1 +0,0 @@
|
||||
user.py
|
||||
@@ -1 +0,0 @@
|
||||
workflow_approval.py
|
||||
@@ -1 +0,0 @@
|
||||
workflow_job_template.py
|
||||
@@ -1 +0,0 @@
|
||||
workflow_job_template_node.py
|
||||
@@ -1 +0,0 @@
|
||||
workflow_launch.py
|
||||
@@ -1 +0,0 @@
|
||||
workflow_node_wait.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 (
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -74,6 +74,7 @@ Notable releases of the `{{ collection_namespace }}.{{ collection_package }}` co
|
||||
- 7.0.0 is intended to be identical to the content prior to the migration, aside from changes necessary to function as a collection.
|
||||
- 11.0.0 has no non-deprecated modules that depend on the deprecated `tower-cli` [PyPI](https://pypi.org/project/ansible-tower-cli/).
|
||||
- 19.2.1 large renaming purged "tower" names (like options and module names), adding redirects for old names
|
||||
- 21.11.0 "tower" modules deprecated and symlinks removed.
|
||||
- 0.0.1-devel is the version you should see if installing from source, which is intended for development and expected to be unstable.
|
||||
{% else %}
|
||||
- 3.7.0 initial release
|
||||
|
||||
Reference in New Issue
Block a user