Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ansible code bot recommendations #15

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
yaml-files:
- '*.yaml'
- '*.yml'
- '.yamllint'
- "*.yaml"
- "*.yml"
- .yamllint

rules:
truthy:
allowed-values:
- 'true'
- 'false'
- "true"
- "false"
16 changes: 8 additions & 8 deletions group_vars/aap/aap_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ aap_config: true
aap_config_pah_repo_sync: true
aap_config_organization: "{{ hostvars[groups.satellite | first]['satellite_initial_organization'] }}"

aap_config_inventory_repo_name: "rhis-inventory"
aap_config_default_project: "rhis-code"
aap_config_default_inventory: "Project SCM Inventory"
aap_config_inventory_repo_name: rhis-inventory
aap_config_default_project: rhis-code
aap_config_default_inventory: Project SCM Inventory

aap_config_default_credentials:
- "Machine Credential"
- "Vault Credential"
aap_config_default_notification_template: "Slack Notifications"
aap_config_default_execution_environment: "Automation Hub Default Remote execution environment"
aap_config_default_job_run: "run"
- Machine Credential
- Vault Credential
aap_config_default_notification_template: Slack Notifications
aap_config_default_execution_environment: Automation Hub Default Remote execution environment
aap_config_default_job_run: run

aap_config_default_scm_branch: main

Expand Down
30 changes: 15 additions & 15 deletions group_vars/aap/aap_config_controller_credential.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
---
controller_credentials:
- credential_type: Machine
name: "Machine Credential"
description: "SSH Machine Connection with IdM credentials"
name: Machine Credential
description: SSH Machine Connection with IdM credentials
organization: "{{ aap_config_organization }}"
inputs:
username: "{{ default_ssh_vm_user }}"
password: "{{ techuser_ansible_global_password }}"

- credential_type: Insights
name: "Insights Credential"
description: "Insights Credential"
name: Insights Credential
description: Insights Credential
organization: "{{ aap_config_organization }}"
inputs:
username: "{{ hostvars[groups.satellite | first]['satellite_rhsm_username'] }}"
password: "{{ hostvars[groups.satellite | first]['satellite_rhsm_password'] }}"

- credential_type: Source Control
name: "GitHub Source Credential"
description: "GitHub Credential"
name: GitHub Source Credential
description: GitHub Credential
organization: "{{ aap_config_organization }}"
inputs:
username: "{{ github_username }}"
ssh_key_data: "{{ github_private_key }}"

- credential_type: Vault
name: "Vault Credential"
description: "Vault Credential"
name: Vault Credential
description: Vault Credential
organization: "{{ aap_config_organization }}"
inputs:
vault_password: "{{ vault_password }}"

- credential_type: Vault
name: "New Vault Credential"
description: "New Vault Credential that use in vault password change process"
name: New Vault Credential
description: New Vault Credential that use in vault password change process
organization: "{{ aap_config_organization }}"
inputs:
vault_password: "{{ vault_password }}"
vault_id: 'new_vault_password'
vault_id: new_vault_password

- credential_type: Red Hat Satellite 6
name: "Satellite Credential"
description: "Satellite Credential"
name: Satellite Credential
description: Satellite Credential
organization: "{{ aap_config_organization }}"
inputs:
host: "https://{{ groups.satellite | first }}"
host: https://{{ groups.satellite | first }}
username: "{{ hostvars[groups.satellite | first]['satellite_username'] }}"
password: "{{ hostvars[groups.satellite | first]['satellite_password'] }}"

- credential_type: Machine
name: "Demo Credential"
name: Demo Credential
state: absent
16 changes: 8 additions & 8 deletions group_vars/aap/aap_config_controller_ee.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
controller_execution_environments:
- name: "Automation Hub Default execution environment"
- name: Automation Hub Default execution environment
image: "{{ groups.aap_pah | first }}/ee-supported-rhel8:latest"
credential: "Default Execution Environment Registry Credential"
credential: Default Execution Environment Registry Credential

- name: "Automation Hub Minimal execution environment"
- name: Automation Hub Minimal execution environment
image: "{{ groups.aap_pah | first }}/ee-minimal-rhel8:latest"
credential: "Default Execution Environment Registry Credential"
credential: Default Execution Environment Registry Credential

- name: "Automation Hub Default Remote execution environment"
- name: Automation Hub Default Remote execution environment
image: "{{ groups.aap_pah | first }}/custom_ee_showroom:latest"
credential: "Default Execution Environment Registry Credential"
credential: Default Execution Environment Registry Credential

- name: "Default execution environment"
image: "registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8:latest"
- name: Default execution environment
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8:latest
state: absent
12 changes: 6 additions & 6 deletions group_vars/aap/aap_config_controller_inventory.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
controller_inventories:
- name: "Project SCM Inventory"
description: "Inventory sourced from GitHub inventory project"
- name: Project SCM Inventory
description: Inventory sourced from GitHub inventory project
organization: "{{ aap_config_organization }}"
- name: "Satellite Inventory"
description: "Inventory sourced from Red Hat Satellite 6"
- name: Satellite Inventory
description: Inventory sourced from Red Hat Satellite 6
organization: "{{ aap_config_organization }}"
- name: "Insights Inventory"
description: "Inventory for Insights Remediations"
- name: Insights Inventory
description: Inventory for Insights Remediations
organization: "{{ aap_config_organization }}"
Loading