From e27777a14d23b4b61449474e8233ee49387086be Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Tue, 26 Apr 2022 13:49:35 +0100 Subject: [PATCH] Update docs and tests with Tower references to Controller --- examples/configs/controller_auth.yml | 4 ++-- examples/configs/templates.yml | 6 +++--- examples/configs_export_model/auth.yml | 2 +- examples/configure_controller_export_model.yml | 2 +- examples/templates/collections/requirements.yml | 2 +- examples/templates/tasks/manage_organizations.yml | 2 +- examples/templates/vars/controller_credential_types.yml | 2 +- examples/templates/vars/controller_credentials.yml | 2 +- examples/templates/vars/controller_groups.yml | 2 +- examples/templates/vars/controller_hosts.yml | 2 +- examples/templates/vars/controller_inventories.yml | 2 +- examples/templates/vars/controller_inventory_sources.yml | 2 +- examples/templates/vars/controller_job_templates.yml | 2 +- examples/templates/vars/controller_labels.yml | 2 +- examples/templates/vars/controller_ldap_configuration.json | 2 +- .../templates/vars/controller_notification_templates.yml | 2 +- examples/templates/vars/controller_organizations.yml | 2 +- .../templates/vars/controller_organizations_with_hub.yml | 2 +- examples/templates/vars/controller_projects.yml | 2 +- examples/templates/vars/controller_schedules.yml | 2 +- examples/templates/vars/controller_users.yml | 2 +- examples/templates/vars/controller_workflows.yml | 2 +- playbooks/README.md | 2 +- roles/applications/defaults/main.yml | 2 +- roles/credential_input_sources/README.md | 2 +- roles/credential_input_sources/defaults/main.yml | 2 +- .../tests/configs/credential_input_sources.yml | 2 +- roles/credential_input_sources/tests/test.yml | 2 +- roles/credential_types/README.md | 2 +- roles/credential_types/defaults/main.yml | 2 +- roles/credentials/defaults/main.yml | 4 ++-- roles/groups/defaults/main.yml | 2 +- roles/hosts/defaults/main.yml | 2 +- roles/inventories/defaults/main.yml | 2 +- roles/inventory_sources/defaults/main.yml | 6 +++--- roles/job_templates/defaults/main.yml | 2 +- roles/license/README.md | 2 +- roles/notification_templates/defaults/main.yml | 2 +- .../notification_templates/tests/configs/notifications.yml | 2 +- roles/projects/defaults/main.yml | 2 +- roles/roles/defaults/main.yml | 2 +- roles/schedules/defaults/main.yml | 2 +- roles/settings/defaults/main.yml | 2 +- roles/teams/defaults/main.yml | 2 +- roles/users/defaults/main.yml | 2 +- roles/workflow_job_templates/defaults/main.yml | 2 +- roles/workflow_launch/tasks/main.yml | 4 ++-- 47 files changed, 54 insertions(+), 54 deletions(-) diff --git a/examples/configs/controller_auth.yml b/examples/configs/controller_auth.yml index de1a1883b..354e3050b 100644 --- a/examples/configs/controller_auth.yml +++ b/examples/configs/controller_auth.yml @@ -1,6 +1,6 @@ -# User may add tower auth creds to this file and encrypt it using `ansible-vault` +# User may add controller auth creds to this file and encrypt it using `ansible-vault` --- -# controller_hostname: ansible-tower-web-svc-test-project.example.com +# controller_hostname: ansible-controller-web-svc-test-project.example.com controller_username: admin controller_password: password controller_validate_certs: false diff --git a/examples/configs/templates.yml b/examples/configs/templates.yml index 4f2d0ca1c..539bf1c11 100644 --- a/examples/configs/templates.yml +++ b/examples/configs/templates.yml @@ -1,8 +1,8 @@ --- # Only Job name, type, project and playbook are required -# Survey spec can be exported from existing job template using: -# tower-cli job_template survey --name="my job template" -f yaml -# https://github.com/ansible/tower-cli/blob/master/docs/source/cli_ref/usage/SURVEYS.rst +# Survey spec can be exported from existing job template querying the API. +# Find the ID of the job template and use the following URL: +# https:///api/v2/job_templates//survey_spec/ controller_templates: - name: test-template-1 description: created by Ansible Playbook diff --git a/examples/configs_export_model/auth.yml b/examples/configs_export_model/auth.yml index de1a1883b..9aacf357e 100644 --- a/examples/configs_export_model/auth.yml +++ b/examples/configs_export_model/auth.yml @@ -1,4 +1,4 @@ -# User may add tower auth creds to this file and encrypt it using `ansible-vault` +# User may add controller auth creds to this file and encrypt it using `ansible-vault` --- # controller_hostname: ansible-tower-web-svc-test-project.example.com controller_username: admin diff --git a/examples/configure_controller_export_model.yml b/examples/configure_controller_export_model.yml index 8fcdc9e2f..fbf57d499 100644 --- a/examples/configure_controller_export_model.yml +++ b/examples/configure_controller_export_model.yml @@ -14,7 +14,7 @@ # controller_password: changeme pre_tasks: - - name: Wait for Tower to come up + - name: Wait for Controller to come up uri: url: "{{ controller_hostname }}/api/v2/ping" status_code: 200 diff --git a/examples/templates/collections/requirements.yml b/examples/templates/collections/requirements.yml index 6c891c45e..f5983cea1 100644 --- a/examples/templates/collections/requirements.yml +++ b/examples/templates/collections/requirements.yml @@ -1,6 +1,6 @@ --- collections: - name: awx.awx - - name: ansible.tower + - name: ansible.controller - name: redhat_cop.controller_configuration ... diff --git a/examples/templates/tasks/manage_organizations.yml b/examples/templates/tasks/manage_organizations.yml index b179fee6a..636bb59db 100644 --- a/examples/templates/tasks/manage_organizations.yml +++ b/examples/templates/tasks/manage_organizations.yml @@ -1,5 +1,5 @@ --- -- name: Get list of organizations from Tower +- name: Get list of organizations from Controller uri: force_basic_auth: true method: GET diff --git a/examples/templates/vars/controller_credential_types.yml b/examples/templates/vars/controller_credential_types.yml index c57ebe584..01e3dd1f3 100644 --- a/examples/templates/vars/controller_credential_types.yml +++ b/examples/templates/vars/controller_credential_types.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/credential_types +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/credential_types # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_credentials.yml b/examples/templates/vars/controller_credentials.yml index 262aa648f..878580955 100644 --- a/examples/templates/vars/controller_credentials.yml +++ b/examples/templates/vars/controller_credentials.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/credentials +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/credentials # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_groups.yml b/examples/templates/vars/controller_groups.yml index ac864d81b..c2d20f57f 100644 --- a/examples/templates/vars/controller_groups.yml +++ b/examples/templates/vars/controller_groups.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/groups +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/groups # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_hosts.yml b/examples/templates/vars/controller_hosts.yml index 8e88ccab9..36fe008d1 100644 --- a/examples/templates/vars/controller_hosts.yml +++ b/examples/templates/vars/controller_hosts.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/hosts +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/hosts # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_inventories.yml b/examples/templates/vars/controller_inventories.yml index 2e46dfeb4..555fa95d5 100644 --- a/examples/templates/vars/controller_inventories.yml +++ b/examples/templates/vars/controller_inventories.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/inventories +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/inventories # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_inventory_sources.yml b/examples/templates/vars/controller_inventory_sources.yml index 1f1a163ab..c083003f0 100644 --- a/examples/templates/vars/controller_inventory_sources.yml +++ b/examples/templates/vars/controller_inventory_sources.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/inventory_sources +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/inventory_sources # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_job_templates.yml b/examples/templates/vars/controller_job_templates.yml index 065f27f51..2bb4a7944 100644 --- a/examples/templates/vars/controller_job_templates.yml +++ b/examples/templates/vars/controller_job_templates.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/job_templates +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/job_templates # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_labels.yml b/examples/templates/vars/controller_labels.yml index bb6584759..1fc24ccda 100644 --- a/examples/templates/vars/controller_labels.yml +++ b/examples/templates/vars/controller_labels.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/labels +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/labels # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_ldap_configuration.json b/examples/templates/vars/controller_ldap_configuration.json index 27f396c80..45209d806 100644 --- a/examples/templates/vars/controller_ldap_configuration.json +++ b/examples/templates/vars/controller_ldap_configuration.json @@ -1,4 +1,4 @@ -// Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/settings +// Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/settings // if you need help customizing these settings. { diff --git a/examples/templates/vars/controller_notification_templates.yml b/examples/templates/vars/controller_notification_templates.yml index 362a3d813..3f09c26aa 100644 --- a/examples/templates/vars/controller_notification_templates.yml +++ b/examples/templates/vars/controller_notification_templates.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/falsetification_templates +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/falsetification_templates # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_organizations.yml b/examples/templates/vars/controller_organizations.yml index c683337c5..555321c44 100644 --- a/examples/templates/vars/controller_organizations.yml +++ b/examples/templates/vars/controller_organizations.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/organizations +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/organizations # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_organizations_with_hub.yml b/examples/templates/vars/controller_organizations_with_hub.yml index a91aee4bc..5a4946e2e 100644 --- a/examples/templates/vars/controller_organizations_with_hub.yml +++ b/examples/templates/vars/controller_organizations_with_hub.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/organizations +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/organizations # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_projects.yml b/examples/templates/vars/controller_projects.yml index 55b9043da..dc5c33a4a 100644 --- a/examples/templates/vars/controller_projects.yml +++ b/examples/templates/vars/controller_projects.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/projects +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/projects # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_schedules.yml b/examples/templates/vars/controller_schedules.yml index 80fc1a4b4..fdec061ce 100644 --- a/examples/templates/vars/controller_schedules.yml +++ b/examples/templates/vars/controller_schedules.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/schedules +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/schedules # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_users.yml b/examples/templates/vars/controller_users.yml index a1d31d0be..587a9d96f 100644 --- a/examples/templates/vars/controller_users.yml +++ b/examples/templates/vars/controller_users.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/users +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/users # for documentation and additional parameter information --- diff --git a/examples/templates/vars/controller_workflows.yml b/examples/templates/vars/controller_workflows.yml index 10948f6ce..2f1b60e59 100644 --- a/examples/templates/vars/controller_workflows.yml +++ b/examples/templates/vars/controller_workflows.yml @@ -1,4 +1,4 @@ -# Refer to https://github.com/redhat-cop/tower_configuration/tree/devel/roles/workflow_job_templates +# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/workflow_job_templates # for documentation and additional parameter information --- diff --git a/playbooks/README.md b/playbooks/README.md index 2a6ff0ead..d65bd1860 100644 --- a/playbooks/README.md +++ b/playbooks/README.md @@ -24,7 +24,7 @@ Examples of the playbooks in use can be found in the examples folder. ## Variables -### Standard Tower Variables +### Standard Controller Variables |Variable Name|Default Value|Required|Description|Example| |:---:|:---:|:---:|:---:|:---:| |`controller_state`|"present"|no|The state all objects will take unless overriden by object default|'absent'| diff --git a/roles/applications/defaults/main.yml b/roles/applications/defaults/main.yml index 8ddf2befa..b32256b29 100644 --- a/roles/applications/defaults/main.yml +++ b/roles/applications/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the license role -# a list of dictionaries describing the Tower applications +# a list of dictionaries describing the Controller applications controller_applications: [] # possible fields: # - name: "app_name" # mandatory diff --git a/roles/credential_input_sources/README.md b/roles/credential_input_sources/README.md index 5b322c257..6de8f585a 100644 --- a/roles/credential_input_sources/README.md +++ b/roles/credential_input_sources/README.md @@ -57,7 +57,7 @@ This also speeds up the overall role. |`description`|`False`|no|str|Description to use for the credential input source.| |`state`|`present`|no|str|Desired state of the resource.| -For further details on fields see https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_plugins.html +For further details on fields see https://docs.ansible.com/automation-controller/latest/html/userguide/credential_plugins.html ### Standard Project Data Structure #### Json Example diff --git a/roles/credential_input_sources/defaults/main.yml b/roles/credential_input_sources/defaults/main.yml index 6a0787bca..3d7c7537c 100644 --- a/roles/credential_input_sources/defaults/main.yml +++ b/roles/credential_input_sources/defaults/main.yml @@ -9,7 +9,7 @@ # controller_validate_certs: false # These are the default variables specific to the license role -# list of dicts describing Tower credential input sources +# list of dicts describing Controller credential input sources controller_credential_input_sources: [] # possible values: # - target_credential: "credential_name" # mandatory diff --git a/roles/credential_input_sources/tests/configs/credential_input_sources.yml b/roles/credential_input_sources/tests/configs/credential_input_sources.yml index f8df95c23..b65ec9b44 100644 --- a/roles/credential_input_sources/tests/configs/credential_input_sources.yml +++ b/roles/credential_input_sources/tests/configs/credential_input_sources.yml @@ -1,5 +1,5 @@ --- -tower_credential_input_sources: +controller_credential_input_sources: - source_credential: cyberark target_credential: gitlab input_field_name: password diff --git a/roles/credential_input_sources/tests/test.yml b/roles/credential_input_sources/tests/test.yml index b57da1731..43f6862df 100644 --- a/roles/credential_input_sources/tests/test.yml +++ b/roles/credential_input_sources/tests/test.yml @@ -19,5 +19,5 @@ extensions: ["yml"] roles: - - {role: ../.., when: tower_credential_input_sources is defined} + - {role: ../.., when: controller_credential_input_sources is defined} ... diff --git a/roles/credential_types/README.md b/roles/credential_types/README.md index 4288148f0..9807341b5 100644 --- a/roles/credential_types/README.md +++ b/roles/credential_types/README.md @@ -73,7 +73,7 @@ The workaround is to use the following format: The role will strip the double space between the curly bracket in order to provide controller with the correct format for the Injectors. ### Input and Injector Schema -The following detais the data format to use for inputs and injectors. These can be in either YAML or JSON For the most up to date information and more details see [Custom Credential Types - Ansible Tower Documentation](https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_types.html) +The following detais the data format to use for inputs and injectors. These can be in either YAML or JSON For the most up to date information and more details see [Custom Credential Types - Ansible Controller Documentation](https://docs.ansible.com/automation-controller/latest/html/userguide/credential_plugins.html) #### Input Schema ```yaml diff --git a/roles/credential_types/defaults/main.yml b/roles/credential_types/defaults/main.yml index 30b0fd10d..91a8a2f6b 100644 --- a/roles/credential_types/defaults/main.yml +++ b/roles/credential_types/defaults/main.yml @@ -9,7 +9,7 @@ # controller_validate_certs: false # These are the default variables specific to the license role -# list of dict to define Tower credential types +# list of dict to define Controller credential types controller_credential_types: [] # possible fields: # - name: "cred_type_name" # mandatory diff --git a/roles/credentials/defaults/main.yml b/roles/credentials/defaults/main.yml index 2f115eb55..dbc9accae 100644 --- a/roles/credentials/defaults/main.yml +++ b/roles/credentials/defaults/main.yml @@ -10,14 +10,14 @@ # These are the default variables specific to the license role -# a list of dics describing Tower credentials +# a list of dicts describing Controller credentials controller_credentials: [] # possible fields # - name: "cred_name" # mandatory # new_name: "new_name" # optional # description: "some description" # optional # organization: "Default" # optional (str or org dict with name field) -# credential_type: "ssh" # optional, choices: ssh (i.e. Machine), vault, net, scm, aws, vmware, satellite6, cloudforms, gce, azure_rm, openstack, rhv, insights, tower (str or cred type dict with name field) +# credential_type: "ssh" # optional, choices: ssh (i.e. Machine), vault, net, scm, aws, vmware, satellite6, cloudforms, gce, azure_rm, openstack, rhv, insights, controller (str or cred type dict with name field) # kind: # deprecated, use credential_type (str or cred type dict with kind field) # inputs: {} # optional, dictionary of input fields # user: "owner_name" # optional, user owning the credential (str or user dict with username field) diff --git a/roles/groups/defaults/main.yml b/roles/groups/defaults/main.yml index d11154d5d..68c336821 100644 --- a/roles/groups/defaults/main.yml +++ b/roles/groups/defaults/main.yml @@ -9,7 +9,7 @@ # controller_validate_certs: false # These are the default variables specific to the license role -# list of dicts to describe Tower inventory groups +# list of dicts to describe Controller inventory groups controller_groups: [] # possible fields are: # - name: "group_name" # mandatory diff --git a/roles/hosts/defaults/main.yml b/roles/hosts/defaults/main.yml index 3f1de350a..43d0c3e79 100644 --- a/roles/hosts/defaults/main.yml +++ b/roles/hosts/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the license role -# list of dicts to describe Tower inventory hosts +# list of dicts to describe Controller inventory hosts controller_hosts: [] # possible fields: # - name: "host_name" # mandatory diff --git a/roles/inventories/defaults/main.yml b/roles/inventories/defaults/main.yml index 3b063f7dd..87df34ff7 100644 --- a/roles/inventories/defaults/main.yml +++ b/roles/inventories/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the license role -# list of dicts to describe Tower inventories +# list of dicts to describe Controller inventories controller_inventories: [] # possible fields: # - name: "inventory_name" # mandatory diff --git a/roles/inventory_sources/defaults/main.yml b/roles/inventory_sources/defaults/main.yml index 6a2bc3d1e..6ea95b461 100644 --- a/roles/inventory_sources/defaults/main.yml +++ b/roles/inventory_sources/defaults/main.yml @@ -9,14 +9,14 @@ # controller_validate_certs: false # These are the default variables specific to the license role -# list of dict to describe Tower inventory sources +# list of dict to describe Controller inventory sources controller_inventory_sources: [] # - name: "inv_source_name" # mandatory # inventory: "inventory_name" # mandatory, str or inventory dict with name field # organization: "Default" # optional, str or organization dict with name field # new_name: "new_name" # optional # description: "some description" # optional -# source: "" # optional, choices: scm, ec2, gce, azure_rm, vmware, satellite6, openstack, rhv, tower, custom +# source: "" # optional, choices: scm, ec2, gce, azure_rm, vmware, satellite6, openstack, rhv, controller, custom # source_project: "project_name" # optional, for scm str or project dict with name field # source_path: "inventory/hosts" # optional, for scm type relative path to inventory # source_script: "some_custom_script" # optional, for custom type name of custom inventory script (obsolete!) @@ -24,7 +24,7 @@ controller_inventory_sources: [] # credential: "credential_name" # optional # overwrite: false # optional, boolean # overwrite_vars: false # optional, boolean -# custom_virtualenv: "/var/lib/awx/myvirtualenv" # optional, absolute path to virtualenv on Tower +# custom_virtualenv: "/var/lib/awx/myvirtualenv" # optional, absolute path to virtualenv on Controller # timeout: 0 # optional, in seconds # verbosity: 0 # optional, choices: 0, 1, 2 # update_on_launch: false # optional, boolean diff --git a/roles/job_templates/defaults/main.yml b/roles/job_templates/defaults/main.yml index 8b82e8569..c7ecd9ad9 100644 --- a/roles/job_templates/defaults/main.yml +++ b/roles/job_templates/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the job_templates role -# list of dict describing Tower job templates: +# list of dict describing Controller job templates: controller_templates: [] # possible fields: # - name: "job_template_name" # mandatory diff --git a/roles/license/README.md b/roles/license/README.md index 2c36a52fe..968ea571a 100644 --- a/roles/license/README.md +++ b/roles/license/README.md @@ -46,7 +46,7 @@ controller_configuration_license_secure_logging defaults to the value of control |`eula_accepted`|""|yes|bool|DEPRECATED since Tower 3.8 - Whether to accept the End User License Agreement for Ansible controller| |`force`|`False`|no|bool|By default, the license manifest will only be applied if controller is currently unlicensed or trial licensed. When force=true, the license is always applied.| -For further details on fields see https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_plugins.html +For further details on fields see https://docs.ansible.com/automation-controller/latest/html/userguide/credential_plugins.html ### Standard Project Data Structure #### Json Example diff --git a/roles/notification_templates/defaults/main.yml b/roles/notification_templates/defaults/main.yml index 420b59fdb..0aeed0a4d 100644 --- a/roles/notification_templates/defaults/main.yml +++ b/roles/notification_templates/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the notification_templates role -# list of dict to describe Tower notification templates +# list of dict to describe Controller notification templates controller_notifications: [] # possible fields: # - name: "notif_name" # mandatory diff --git a/roles/notification_templates/tests/configs/notifications.yml b/roles/notification_templates/tests/configs/notifications.yml index 7a4fb02f9..a6db22b91 100644 --- a/roles/notification_templates/tests/configs/notifications.yml +++ b/roles/notification_templates/tests/configs/notifications.yml @@ -1,7 +1,7 @@ --- controller_notification_templates: - name: Email notification - description: Send out emails for tower jobs + description: Send out emails for Controller jobs organization: Default notification_type: email notification_configuration: diff --git a/roles/projects/defaults/main.yml b/roles/projects/defaults/main.yml index 22a235321..5d645b7a1 100644 --- a/roles/projects/defaults/main.yml +++ b/roles/projects/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the projects role -# list of dict describing Tower projects +# list of dict describing Controller projects controller_projects: [] # possible fields: # - name: "project_name" # mandatory diff --git a/roles/roles/defaults/main.yml b/roles/roles/defaults/main.yml index 64b014cef..590154d53 100644 --- a/roles/roles/defaults/main.yml +++ b/roles/roles/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the controller_role role -# list of dict describing a Tower access controle rule +# list of dict describing a Controller access control rule controller_roles: [] # possible fields: # - role: # mandatory, choices: admin, read, member, execute, adhoc, update, use, auditor, project_admin, diff --git a/roles/schedules/defaults/main.yml b/roles/schedules/defaults/main.yml index e3f82481c..f9fe98d9b 100644 --- a/roles/schedules/defaults/main.yml +++ b/roles/schedules/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the license role -# list of dict describing Tower schedules: +# list of dict describing Controller schedules: controller_schedules: [] # possible fields: # - name: "schedule_name" # mandatory diff --git a/roles/settings/defaults/main.yml b/roles/settings/defaults/main.yml index e810ed73a..30758d49b 100644 --- a/roles/settings/defaults/main.yml +++ b/roles/settings/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the controller_settings role -# list of dicts (or a single dict) describing the Tower settings +# list of dicts (or a single dict) describing the Controller settings controller_settings: [] # possible fields: # - settings: # either this field or name/value is mandatory diff --git a/roles/teams/defaults/main.yml b/roles/teams/defaults/main.yml index 7ba712b7c..10cc90dc3 100644 --- a/roles/teams/defaults/main.yml +++ b/roles/teams/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the teams role -# list of dicts describing the Tower teams +# list of dicts describing the Controller teams controller_teams: [] # possible fields: # - name: "team_name" # mandatory diff --git a/roles/users/defaults/main.yml b/roles/users/defaults/main.yml index 0564ad381..b38844f9b 100644 --- a/roles/users/defaults/main.yml +++ b/roles/users/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the users role -# list of dicts describing Tower users +# list of dicts describing Controller users controller_user_accounts: [] # possible fields: # - username: "user_name" # mandatory diff --git a/roles/workflow_job_templates/defaults/main.yml b/roles/workflow_job_templates/defaults/main.yml index f0ecf63cd..22c91e9e9 100644 --- a/roles/workflow_job_templates/defaults/main.yml +++ b/roles/workflow_job_templates/defaults/main.yml @@ -10,7 +10,7 @@ # These are the default variables specific to the workflow_job_templates role -# list of dicts describing Tower workflow templates +# list of dicts describing Controller workflow templates controller_workflows: [] # - name: "workflow_template_name" # mandatory # new_name: "new_name" # optional diff --git a/roles/workflow_launch/tasks/main.yml b/roles/workflow_launch/tasks/main.yml index ef32cb204..98de15b05 100644 --- a/roles/workflow_launch/tasks/main.yml +++ b/roles/workflow_launch/tasks/main.yml @@ -1,6 +1,6 @@ --- -# Launch tower Workflow -- name: Launch a Tower Workflow +# Launch Controller Workflow +- name: Launch a Controller Workflow workflow_launch: name: "{{ __workflow_launch_item.name }}" organization: "{{ __workflow_launch_item.organization | default(omit, true) }}"