From bc1ac99b3f356eb874de00c7d399df0ca2052e17 Mon Sep 17 00:00:00 2001 From: David Danielsson Date: Fri, 3 Nov 2023 17:24:47 -0500 Subject: [PATCH] linting --- .ansible-lint.yml => .ansible-lint | 3 +- .config/ansible-lint.yml | 25 -------- .yaml-lint.yml => .yamllint | 6 +- group_vars/all/aap_install.yml | 20 +++---- group_vars/all/ah_collection_namespaces.yml | 4 +- group_vars/all/ah_ee_list.yml | 12 ++-- group_vars/all/ah_repositories.yml | 14 ++--- group_vars/all/ah_users.yml | 2 +- group_vars/all/auth.yml | 2 +- group_vars/all/credential_types.yml | 4 +- group_vars/all/credentials.yml | 24 ++++---- group_vars/all/execution_environments.yml | 6 +- group_vars/all/instance_groups.yml | 2 +- group_vars/all/inventory_sources.yml | 2 +- group_vars/all/organizations.yml | 2 +- group_vars/all/schedule.yml | 2 +- group_vars/all/users.yml | 2 +- group_vars/dev/credential_input_sources.yml | 7 --- group_vars/dev/groups.yml | 5 -- group_vars/dev/hosts.yml | 4 -- group_vars/dev/instance_groups.yml | 1 - group_vars/dev/inventory_sources.yml | 2 +- group_vars/dev/job_templates.yml | 1 - group_vars/dev/notifications.yml | 14 ----- group_vars/dev/workflows.yml | 60 -------------------- group_vars/prod/credential_input_sources.yml | 7 --- group_vars/prod/groups.yml | 5 -- group_vars/prod/hosts.yml | 4 -- group_vars/prod/instance_groups.yml | 1 - group_vars/prod/main.yml | 2 +- group_vars/prod/notifications.yml | 14 ----- group_vars/prod/workflows.yml | 60 -------------------- group_vars/test/credential_input_sources.yml | 7 --- group_vars/test/groups.yml | 5 -- group_vars/test/hosts.yml | 4 -- group_vars/test/instance_groups.yml | 1 - group_vars/test/notifications.yml | 14 ----- group_vars/test/workflows.yml | 60 -------------------- playbooks/console_token_refresh.yml | 2 +- playbooks/controller_config.yml | 10 ++-- playbooks/custom_collection.yml | 2 +- playbooks/hub_config.yml | 2 +- playbooks/install_aap.yml | 2 +- 43 files changed, 64 insertions(+), 364 deletions(-) rename .ansible-lint.yml => .ansible-lint (87%) delete mode 100644 .config/ansible-lint.yml rename .yaml-lint.yml => .yamllint (92%) diff --git a/.ansible-lint.yml b/.ansible-lint similarity index 87% rename from .ansible-lint.yml rename to .ansible-lint index c5d8262..1654754 100644 --- a/.ansible-lint.yml +++ b/.ansible-lint @@ -29,10 +29,9 @@ skip_list: warn_list: # or 'skip_list' to silence them completely - git-latest # Allow for newest git version - package-latest # Allow newest package version - - risky-file-permissions # File permissions unset or incorrect. - - risky-shell-pipe # Shells that use pipes should set the pipefail option. - template-instead-of-copy # Templated files should use template instead of copy - command-instead-of-shell # Use shell only when shell functionality is required. + - var-naming[no-role-prefix] # Because I don't want to follow this rule at this time # Set verbosity verbosity: 1 diff --git a/.config/ansible-lint.yml b/.config/ansible-lint.yml deleted file mode 100644 index c735906..0000000 --- a/.config/ansible-lint.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Ansible Linter rules -mock_modules: - - ansible.controller.controller_api - -# Exclude paths from linter -exclude_paths: - - '.github/' - - 'changelogs/*' - # - '${PWD}/playbooks/install_configure.yml' - -# Ansible Linter rules -skip_list: - - yaml[colons] # Violations reported by yamllint. - - yaml[line-length] # Violations reported by yamllint. - - yaml[new-line-at-end-of-file] # Violations reported by yamllint. - -warn_list: # or 'skip_list' to silence them completely - - git-latest # Allow for newest git version - - package-latest # Allow newest package version - - risky-file-permissions # File permissions unset or incorrect. - - template-instead-of-copy # Templated files should use template instead of copy - - command-instead-of-shell # Use shell only when shell functionality is required. - - var-naming[no-role-prefix] # Because I don't want to follow this rule at this time -... diff --git a/.yaml-lint.yml b/.yamllint similarity index 92% rename from .yaml-lint.yml rename to .yamllint index 64fbef4..7c273a5 100644 --- a/.yaml-lint.yml +++ b/.yamllint @@ -45,11 +45,11 @@ rules: spaces: 2 indent-sequences: true check-multi-line-strings: false - key-duplicates: true - new-line-at-end-of-file: true + key-duplicates: enable + new-line-at-end-of-file: enable new-lines: type: unix - trailing-spaces: true + trailing-spaces: {} truthy: allowed-values: ['true', 'false'] check-keys: true diff --git a/group_vars/all/aap_install.yml b/group_vars/all/aap_install.yml index c2a0940..cc5acd2 100644 --- a/group_vars/all/aap_install.yml +++ b/group_vars/all/aap_install.yml @@ -26,10 +26,10 @@ aap_setup_prep_inv_vars: # web_server_ssl_key: /path/to/tower.key pg_password: "{{ ansible_password | default('Password1234!') }}" pg_host: "{{ aap_db_host | default(aap_setup_prep_inv_nodes['database'][0]) }}" - pg_port: '5432' - pg_database: 'awx' - pg_username: 'awx' - pg_sslmode: 'prefer' # set to 'verify-full' for client-side enforced SSL + pg_port: "5432" + pg_database: awx + pg_username: awx + pg_sslmode: prefer # set to 'verify-full' for client-side enforced SSL automationhub_admin_password: "{{ ansible_password | default('Password1234!') }}" # automationhub_importer_settings: "" automationhub_require_content_approval: true @@ -40,18 +40,18 @@ aap_setup_prep_inv_vars: # automationhub_ssl_key: "" # automationhub_backup_collections: "" automationhub_pg_host: "{{ ah_db_host | default(aap_setup_prep_inv_nodes['database'][1]) | default(aap_setup_prep_inv_nodes['database'][0]) }}" - automationhub_pg_port: '5432' - automationhub_pg_database: 'automationhub' - automationhub_pg_username: 'automationhub' + automationhub_pg_port: "5432" + automationhub_pg_database: automationhub + automationhub_pg_username: automationhub automationhub_pg_password: "{{ ansible_password | default('Password1234!') }}" - automationhub_pg_sslmode: 'prefer' # set to 'verify-full' for client-side enforced SSL + automationhub_pg_sslmode: prefer # set to 'verify-full' for client-side enforced SSL # sso_keystore_password: "{{ ansible_password | default('Password1234!') }}" # automationhub_main_url: 'https://automationhub.ansible.com' automationedacontroller_admin_password: "{{ ansible_password | default('Password1234!') }}" automationedacontroller_pg_host: "{{ aap_db_host | default(aap_setup_prep_inv_nodes['database'][0]) }}" - automationedacontroller_pg_port: '5432' + automationedacontroller_pg_port: "5432" automationedacontroller_pg_database: "{{ ah_db_host | default(aap_setup_prep_inv_nodes['database'][1]) | default(aap_setup_prep_inv_nodes['database'][0]) }}" - automationedacontroller_pg_username: 'automationedacontroller' + automationedacontroller_pg_username: automationedacontroller automationedacontroller_pg_password: "{{ ansible_password | default('Password1234!') }}" # automation_controller_main_url = '' # automationedacontroller_controller_verify_ssl = true diff --git a/group_vars/all/ah_collection_namespaces.yml b/group_vars/all/ah_collection_namespaces.yml index e778c68..b84e646 100644 --- a/group_vars/all/ah_collection_namespaces.yml +++ b/group_vars/all/ah_collection_namespaces.yml @@ -7,6 +7,6 @@ ah_namespaces: description: Namespace to test publishing collections resources: "# Redhat CoP\nA Namespace to test publishing collections" links: - - name: "Red Hat" - url: "https://www.redhat.com" + - name: Red Hat + url: https://www.redhat.com ... diff --git a/group_vars/all/ah_ee_list.yml b/group_vars/all/ah_ee_list.yml index ceef79e..d8c6ba1 100644 --- a/group_vars/all/ah_ee_list.yml +++ b/group_vars/all/ah_ee_list.yml @@ -10,12 +10,12 @@ ee_list: - netaddr galaxy: collections: - - infra.controller_configuration - - infra.ah_configuration - - infra.ee_utilities - - infra.aap_utilities - - awx.awx + - infra.controller_configuration + - infra.ah_configuration + - infra.ee_utilities + - infra.aap_utilities + - awx.awx build_steps: append_final: - RUN dnf update -y -... \ No newline at end of file +... diff --git a/group_vars/all/ah_repositories.yml b/group_vars/all/ah_repositories.yml index f5d577b..ce48a68 100644 --- a/group_vars/all/ah_repositories.yml +++ b/group_vars/all/ah_repositories.yml @@ -2,14 +2,14 @@ ah_collection_remotes: - name: rh-certified token: "{{ cloud_token }}" - url: 'https://console.redhat.com/api/automation-hub/content/published/' - auth_url: 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token' + url: https://console.redhat.com/api/automation-hub/content/published/ + auth_url: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token - name: validated token: "{{ cloud_token }}" - url: 'https://console.redhat.com/api/automation-hub/content/validated/' - auth_url: 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token' + url: https://console.redhat.com/api/automation-hub/content/validated/ + auth_url: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token - name: community - url: 'https://galaxy.ansible.com/api/' + url: https://galaxy.ansible.com/api/ requirements: - infra.ah_configuration - infra.controller_configuration @@ -29,5 +29,5 @@ ah_collection_repositories: - name: validated remote: validated - name: community - remote: community -... \ No newline at end of file + remote: community +... diff --git a/group_vars/all/ah_users.yml b/group_vars/all/ah_users.yml index 6e1c47b..5c7290d 100644 --- a/group_vars/all/ah_users.yml +++ b/group_vars/all/ah_users.yml @@ -8,5 +8,5 @@ ah_users: append: true is_superuser: true password: "{{ ah_token_password }}" - state: "present" + state: present ... diff --git a/group_vars/all/auth.yml b/group_vars/all/auth.yml index ea83fea..01c1790 100644 --- a/group_vars/all/auth.yml +++ b/group_vars/all/auth.yml @@ -8,7 +8,7 @@ controller_validate_certs: false ah_host: "{{ ah_hostname | default(groups['automationhub'][0]) }}" ah_username: "{{ ah_user | default('admin') }}" ah_password: "{{ ah_pass }}" -ah_path_prefix: 'galaxy' # this is for private automation hub +ah_path_prefix: galaxy # this is for private automation hub validate_certs: false ee_registry_username: "{{ ah_username }}" diff --git a/group_vars/all/credential_types.yml b/group_vars/all/credential_types.yml index 55d1e3b..4c7aaf3 100644 --- a/group_vars/all/credential_types.yml +++ b/group_vars/all/credential_types.yml @@ -51,7 +51,7 @@ controller_credential_types_all: secret: true injectors: env: - MY_CERT_FILE_PATH: !unsafe '{{ tower.filename.cert_file }}' + MY_CERT_FILE_PATH: !unsafe "{{ tower.filename.cert_file }}" file: - template.cert_file: !unsafe '{{ priv_key }}' + template.cert_file: !unsafe "{{ priv_key }}" ... diff --git a/group_vars/all/credentials.yml b/group_vars/all/credentials.yml index f77f322..25e15e1 100644 --- a/group_vars/all/credentials.yml +++ b/group_vars/all/credentials.yml @@ -34,21 +34,21 @@ controller_credentials_all: credential_type: Ansible Galaxy/Automation Hub API Token organization: config_as_code inputs: - url: "https://{{ ah_host }}/api/galaxy/content/rh-certified/" + url: https://{{ ah_host }}/api/galaxy/content/rh-certified/ token: "{{ ah_token }}" - name: ah_published credential_type: Ansible Galaxy/Automation Hub API Token organization: config_as_code inputs: - url: "https://{{ ah_host }}/api/galaxy/content/published/" + url: https://{{ ah_host }}/api/galaxy/content/published/ token: "{{ ah_token }}" - name: ah_community credential_type: Ansible Galaxy/Automation Hub API Token organization: config_as_code inputs: - url: "https://{{ ah_host }}/api/galaxy/content/community/" + url: https://{{ ah_host }}/api/galaxy/content/community/ token: "{{ ah_token }}" - name: cr_ah @@ -75,13 +75,13 @@ controller_credentials_all: inputs: vault_password: "{{ vault_pass }}" - # here is an example for getting git ssh cred working - # - name: github - # credential_type: Source Control - # organization: config_as_code - # description: github - # inputs: - # username: "" - # ssh_key_data: "{{ ssh_priv_key }}" - # ssh_key_unlock: "{{ ssh_key_unlock }}" +# here is an example for getting git ssh cred working +# - name: github +# credential_type: Source Control +# organization: config_as_code +# description: github +# inputs: +# username: "" +# ssh_key_data: "{{ ssh_priv_key }}" +# ssh_key_unlock: "{{ ssh_key_unlock }}" ... diff --git a/group_vars/all/execution_environments.yml b/group_vars/all/execution_environments.yml index 80e1f66..b3d7c55 100644 --- a/group_vars/all/execution_environments.yml +++ b/group_vars/all/execution_environments.yml @@ -1,16 +1,16 @@ --- controller_execution_environments_all: - - name: "supported" + - name: supported image: "{{ ah_host }}/ee-supported-rhel8" pull: always credential: cr_ah - - name: "minimal" + - name: minimal image: "{{ ah_host }}/ee-minimal-rhel8" pull: always credential: cr_ah - - name: "old_29_ee" + - name: old_29_ee image: "{{ ah_host }}/ee-29-rhel8" pull: always credential: cr_ah diff --git a/group_vars/all/instance_groups.yml b/group_vars/all/instance_groups.yml index 138cdfb..f6ff689 100644 --- a/group_vars/all/instance_groups.yml +++ b/group_vars/all/instance_groups.yml @@ -1,4 +1,4 @@ --- controller_instance_groups_all: [] # - name: test_instance_group -... +... \ No newline at end of file diff --git a/group_vars/all/inventory_sources.yml b/group_vars/all/inventory_sources.yml index e0538d3..8455b9f 100644 --- a/group_vars/all/inventory_sources.yml +++ b/group_vars/all/inventory_sources.yml @@ -4,7 +4,7 @@ controller_inventory_sources_all: organization: config_as_code source: scm source_project: config_as_code - source_path: "inventory_{{ env }}.yml" + source_path: inventory_{{ env }}.yml inventory: config_as_code credential: "" overwrite: true diff --git a/group_vars/all/organizations.yml b/group_vars/all/organizations.yml index 12e24df..2b2216e 100644 --- a/group_vars/all/organizations.yml +++ b/group_vars/all/organizations.yml @@ -5,7 +5,7 @@ controller_organizations_all: - ah_published - ah_certified - ah_community - # default_environment: supported + # default_environment: supported - name: Default state: absent diff --git a/group_vars/all/schedule.yml b/group_vars/all/schedule.yml index 4d26114..e9241f7 100644 --- a/group_vars/all/schedule.yml +++ b/group_vars/all/schedule.yml @@ -3,5 +3,5 @@ controller_schedules_all: - name: auto_run_console_token_refresh description: Auto run refresh token every 25 days unified_job_template: console_token_refresh # NOTE: you cannot have the same job template name as a project or this will fail - rrule: "DTSTART:20191219T130500Z RRULE:INTERVAL=25;FREQ=DAILY" + rrule: DTSTART:20191219T130500Z RRULE:INTERVAL=25;FREQ=DAILY ... diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index bd69ee9..0e76bdd 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -2,5 +2,5 @@ controller_user_accounts_all: - user: api_user is_superuser: false - password: '{{ controller_api_user_pass }}' + password: "{{ controller_api_user_pass }}" ... diff --git a/group_vars/dev/credential_input_sources.yml b/group_vars/dev/credential_input_sources.yml index 6071095..435f26b 100644 --- a/group_vars/dev/credential_input_sources.yml +++ b/group_vars/dev/credential_input_sources.yml @@ -1,11 +1,4 @@ --- # Commented out content is serving as example for you to add new content. controller_credential_input_sources_dev: [] -# - source_credential: cyberark -# target_credential: gitlab -# input_field_name: password -# metadata: -# object_query: "Safe=MY_SAFE;Object=AWX-user" -# object_query_format: "Exact" -# description: Fill the gitlab credential from CyberArk ... diff --git a/group_vars/dev/groups.yml b/group_vars/dev/groups.yml index e3fed60..44bc11e 100644 --- a/group_vars/dev/groups.yml +++ b/group_vars/dev/groups.yml @@ -1,8 +1,3 @@ --- controller_groups_dev: [] -# - name: group1 -# inventory: localhost -# variables: -# some_var: some_val -# ansible_connection: local ... diff --git a/group_vars/dev/hosts.yml b/group_vars/dev/hosts.yml index 1a24f88..95b5ab7 100644 --- a/group_vars/dev/hosts.yml +++ b/group_vars/dev/hosts.yml @@ -1,7 +1,3 @@ --- controller_hosts_dev: [] -# - name: localhost -# inventory: localhost -# variables: -# ansible_connection: local ... diff --git a/group_vars/dev/instance_groups.yml b/group_vars/dev/instance_groups.yml index 35715e1..31a2dfa 100644 --- a/group_vars/dev/instance_groups.yml +++ b/group_vars/dev/instance_groups.yml @@ -1,4 +1,3 @@ --- controller_instance_groups_dev: [] -# - name: test_instance_group ... diff --git a/group_vars/dev/inventory_sources.yml b/group_vars/dev/inventory_sources.yml index b05ed8b..52a7850 100644 --- a/group_vars/dev/inventory_sources.yml +++ b/group_vars/dev/inventory_sources.yml @@ -4,7 +4,7 @@ controller_inventory_sources_dev: organization: config_as_code source: scm source_project: config_as_code_dev - source_path: "inventory_{{ env }}.yml" + source_path: inventory_{{ env }}.yml inventory: config_as_code_dev credential: "" overwrite: true diff --git a/group_vars/dev/job_templates.yml b/group_vars/dev/job_templates.yml index 860840b..a3a91b6 100644 --- a/group_vars/dev/job_templates.yml +++ b/group_vars/dev/job_templates.yml @@ -16,5 +16,4 @@ controller_templates_dev: extra_vars: # for debugging errors with creds change to false controller_configuration_credentials_secure_logging: true - ... diff --git a/group_vars/dev/notifications.yml b/group_vars/dev/notifications.yml index f18816d..c8bef1c 100644 --- a/group_vars/dev/notifications.yml +++ b/group_vars/dev/notifications.yml @@ -1,17 +1,3 @@ --- controller_notifications_dev: [] -# - name: Email notification differential -# description: Send out emails for tower jobs -# organization: Default -# notification_type: email -# notification_configuration: -# username: '' # this is required even if there's no username -# sender: tower0@example.com -# recipients: -# - admin@example.com -# use_tls: false -# host: smtp.example.com -# use_ssl: false -# password: '' # this is required even if there's no password -# port: 25 ... diff --git a/group_vars/dev/workflows.yml b/group_vars/dev/workflows.yml index 5afff31..e619b61 100644 --- a/group_vars/dev/workflows.yml +++ b/group_vars/dev/workflows.yml @@ -1,63 +1,3 @@ --- controller_workflows_dev: [] -# - name: Simple workflow schema -# description: a basic workflow -# extra_vars: {} -# survey_enabled: false -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# state: present -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] -# survey_spec: {} -# - name: Simple workflow schema2 -# description: a basic workflow -# extra_vars: {} -# state: present -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] ... diff --git a/group_vars/prod/credential_input_sources.yml b/group_vars/prod/credential_input_sources.yml index 3c65ae2..84e64f9 100644 --- a/group_vars/prod/credential_input_sources.yml +++ b/group_vars/prod/credential_input_sources.yml @@ -1,11 +1,4 @@ --- # Commented out content is serving as example for you to add new content. controller_credential_input_sources_prod: [] -# - source_credential: cyberark -# target_credential: gitlab -# input_field_name: password -# metadata: -# object_query: "Safe=MY_SAFE;Object=AWX-user" -# object_query_format: "Exact" -# description: Fill the gitlab credential from CyberArk ... diff --git a/group_vars/prod/groups.yml b/group_vars/prod/groups.yml index f96a7ff..2151a8e 100644 --- a/group_vars/prod/groups.yml +++ b/group_vars/prod/groups.yml @@ -1,8 +1,3 @@ --- controller_groups_prod: [] -# - name: group1 -# inventory: localhost -# variables: -# some_var: some_val -# ansible_connection: local ... diff --git a/group_vars/prod/hosts.yml b/group_vars/prod/hosts.yml index f8b64c7..307c51f 100644 --- a/group_vars/prod/hosts.yml +++ b/group_vars/prod/hosts.yml @@ -1,7 +1,3 @@ --- controller_hosts_prod: [] -# - name: localhost -# inventory: localhost -# variables: -# ansible_connection: local ... diff --git a/group_vars/prod/instance_groups.yml b/group_vars/prod/instance_groups.yml index f2006c0..bd29055 100644 --- a/group_vars/prod/instance_groups.yml +++ b/group_vars/prod/instance_groups.yml @@ -1,4 +1,3 @@ --- controller_instance_groups_prod: [] -# - name: test_instance_group ... diff --git a/group_vars/prod/main.yml b/group_vars/prod/main.yml index 0adf496..b77f5ba 100644 --- a/group_vars/prod/main.yml +++ b/group_vars/prod/main.yml @@ -20,6 +20,6 @@ controller_settings: "{{ controller_settings_all | combine(controller_settings_p controller_teams: "{{ controller_teams_all + controller_teams_prod }}" controller_user_accounts: "{{ controller_user_accounts_all + controller_user_accounts_prod }}" controller_workflows: "{{ controller_workflows_all + controller_workflows_prod }}" -env: "prod" +env: prod scm_branch: "" # when you want it to be default branch just set to "" ... diff --git a/group_vars/prod/notifications.yml b/group_vars/prod/notifications.yml index ba48623..d85567c 100644 --- a/group_vars/prod/notifications.yml +++ b/group_vars/prod/notifications.yml @@ -1,17 +1,3 @@ --- controller_notifications_prod: [] -# - name: Email notification differential -# description: Send out emails for tower jobs -# organization: Default -# notification_type: email -# notification_configuration: -# username: '' # this is required even if there's no username -# sender: tower0@example.com -# recipients: -# - admin@example.com -# use_tls: false -# host: smtp.example.com -# use_ssl: false -# password: '' # this is required even if there's no password -# port: 25 ... diff --git a/group_vars/prod/workflows.yml b/group_vars/prod/workflows.yml index 23b7ab8..3ed0121 100644 --- a/group_vars/prod/workflows.yml +++ b/group_vars/prod/workflows.yml @@ -1,63 +1,3 @@ --- controller_workflows_prod: [] -# - name: Simple workflow schema -# description: a basic workflow -# extra_vars: {} -# survey_enabled: false -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# state: present -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] -# survey_spec: {} -# - name: Simple workflow schema2 -# description: a basic workflow -# extra_vars: {} -# state: present -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] ... diff --git a/group_vars/test/credential_input_sources.yml b/group_vars/test/credential_input_sources.yml index 26a4f36..3ad0917 100644 --- a/group_vars/test/credential_input_sources.yml +++ b/group_vars/test/credential_input_sources.yml @@ -1,11 +1,4 @@ --- # Commented out content is serving as example for you to add new content. controller_credential_input_sources_test: [] -# - source_credential: cyberark -# target_credential: gitlab -# input_field_name: password -# metadata: -# object_query: "Safe=MY_SAFE;Object=AWX-user" -# object_query_format: "Exact" -# description: Fill the gitlab credential from CyberArk ... diff --git a/group_vars/test/groups.yml b/group_vars/test/groups.yml index a3a7029..a055d7a 100644 --- a/group_vars/test/groups.yml +++ b/group_vars/test/groups.yml @@ -1,8 +1,3 @@ --- controller_groups_test: [] -# - name: group1 -# inventory: localhost -# variables: -# some_var: some_val -# ansible_connection: local ... diff --git a/group_vars/test/hosts.yml b/group_vars/test/hosts.yml index cfad1bc..f1e55a5 100644 --- a/group_vars/test/hosts.yml +++ b/group_vars/test/hosts.yml @@ -1,7 +1,3 @@ --- controller_hosts_test: [] -# - name: localhost -# inventory: localhost -# variables: -# ansible_connection: local ... diff --git a/group_vars/test/instance_groups.yml b/group_vars/test/instance_groups.yml index e48b668..18eeb5c 100644 --- a/group_vars/test/instance_groups.yml +++ b/group_vars/test/instance_groups.yml @@ -1,4 +1,3 @@ --- controller_instance_groups_test: [] -# - name: test_instance_group ... diff --git a/group_vars/test/notifications.yml b/group_vars/test/notifications.yml index f4a7e34..0ce02c6 100644 --- a/group_vars/test/notifications.yml +++ b/group_vars/test/notifications.yml @@ -1,17 +1,3 @@ --- controller_notifications_test: [] -# - name: Email notification differential -# description: Send out emails for tower jobs -# organization: Default -# notification_type: email -# notification_configuration: -# username: '' # this is required even if there's no username -# sender: tower0@example.com -# recipients: -# - admin@example.com -# use_tls: false -# host: smtp.example.com -# use_ssl: false -# password: '' # this is required even if there's no password -# port: 25 ... diff --git a/group_vars/test/workflows.yml b/group_vars/test/workflows.yml index f9363f3..e369c0d 100644 --- a/group_vars/test/workflows.yml +++ b/group_vars/test/workflows.yml @@ -1,63 +1,3 @@ --- controller_workflows_test: [] -# - name: Simple workflow schema -# description: a basic workflow -# extra_vars: {} -# survey_enabled: false -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# state: present -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] -# survey_spec: {} -# - name: Simple workflow schema2 -# description: a basic workflow -# extra_vars: {} -# state: present -# allow_simultaneous: false -# ask_variables_on_launch: false -# inventory: -# limit: -# labels: -# - Prod -# scm_branch: -# ask_inventory_on_launch: false -# ask_scm_branch_on_launch: false -# ask_limit_on_launch: false -# organization: Default -# schedules: [] -# simplified_workflow_nodes: -# - all_parents_must_converge: false -# identifier: node101 -# unified_job_template: RHVM-01 -# success_nodes: -# - node201 -# - all_parents_must_converge: false -# identifier: node201 -# unified_job_template: test-template-1 -# notification_templates_started: [] -# notification_templates_success: [] -# notification_templates_error: [] -# notification_templates_approvals: [] ... diff --git a/playbooks/console_token_refresh.yml b/playbooks/console_token_refresh.yml index 069c330..e4fb09d 100644 --- a/playbooks/console_token_refresh.yml +++ b/playbooks/console_token_refresh.yml @@ -4,7 +4,7 @@ connection: local gather_facts: false vars_files: - - "../vaults/{{ env }}.yml" + - ../vaults/{{ env }}.yml tasks: - name: Refresh token ansible.builtin.uri: diff --git a/playbooks/controller_config.yml b/playbooks/controller_config.yml index b488d65..3d1f342 100644 --- a/playbooks/controller_config.yml +++ b/playbooks/controller_config.yml @@ -2,7 +2,7 @@ - name: Playbook to configure ansible controller post installation hosts: all vars_files: - - "../vaults/{{ env }}.yml" + - ../vaults/{{ env }}.yml connection: local tasks: - name: Include setting role @@ -35,8 +35,8 @@ name: infra.controller_configuration.teams when: controller_teams | length is not match('0') - # probably not good but kinda works, looking for better solutions, - # you are better off removing this block and getting token into vault by hand + # probably not good but kinda works, looking for better solutions, + # you are better off removing this block and getting token into vault by hand - name: Figuring out AH token when: ah_token is not defined or ah_token['token'] is defined block: @@ -45,7 +45,7 @@ ah_host: "{{ ah_host | default(groups['automationhub'][0]) }}" ah_username: "{{ ah_token_username | default('admin') }}" ah_password: "{{ ah_token_password }}" - ah_path_prefix: 'galaxy' # this is for private automation hub + ah_path_prefix: galaxy # this is for private automation hub validate_certs: false register: r_ah_token @@ -53,7 +53,7 @@ ansible.builtin.set_fact: ah_token: "{{ ah_token['token'] }}" when: r_ah_token['changed'] # noqa: no-handler - # what needs to be done to guarantee this to work? + # what needs to be done to guarantee this to work? - name: Include credential_types role ansible.builtin.include_role: diff --git a/playbooks/custom_collection.yml b/playbooks/custom_collection.yml index c9ae43f..6f4c52d 100644 --- a/playbooks/custom_collection.yml +++ b/playbooks/custom_collection.yml @@ -4,7 +4,7 @@ connection: local gather_facts: false vars_files: - - "../vaults/{{ env }}.yml" + - ../vaults/{{ env }}.yml tasks: - name: Include namespace role ansible.builtin.include_role: diff --git a/playbooks/hub_config.yml b/playbooks/hub_config.yml index 6266a81..663d4be 100644 --- a/playbooks/hub_config.yml +++ b/playbooks/hub_config.yml @@ -4,7 +4,7 @@ gather_facts: false connection: local vars_files: - - "../vaults/{{ env }}.yml" + - ../vaults/{{ env }}.yml tasks: - name: Include collection_remote role ansible.builtin.include_role: diff --git a/playbooks/install_aap.yml b/playbooks/install_aap.yml index db3a21c..9465e5a 100644 --- a/playbooks/install_aap.yml +++ b/playbooks/install_aap.yml @@ -2,7 +2,7 @@ - name: Playbook to configure ansible automation platform installation hosts: all vars_files: - - "../vaults/{{ env }}.yml" + - ../vaults/{{ env }}.yml tasks: - name: Include aap_setup_download role ansible.builtin.include_role: