Skip to content

Commit

Permalink
Merge pull request #35 from djdanielsson/formatting
Browse files Browse the repository at this point in the history
adding ... to the end of each yml file and added check in yamllint
  • Loading branch information
sean-m-sullivan authored Feb 13, 2021
2 parents 6d528c9 + b39df4a commit dd5e51b
Show file tree
Hide file tree
Showing 51 changed files with 52 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.yml linguist-detectable
*.yaml linguist-detectable
1 change: 1 addition & 0 deletions .github/workflow-config/.ansiblelint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ skip_list:
# [E208]: "File permissions not mentioned. Issue created to fix"
# (Disabled in Oct 2020)
- '208'
...
1 change: 1 addition & 0 deletions .github/workflow-config/.pre-commit-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ repos:
pass_filenames: false
always_run: true
entry: "ansible-lint -c .github/workflow-config/.ansiblelint.yml --exclude=roles/master_role_example"
...
1 change: 1 addition & 0 deletions .github/workflow-config/.yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ rules:
- 'False'
- 'true'
- 'false'
...
1 change: 1 addition & 0 deletions .github/workflow-config/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@
path: "{{ repo_base_dir }}/galaxy.yml"
state: absent
tags: cleanup
...
1 change: 1 addition & 0 deletions .github/workflows/galaxy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ jobs:
-e api_key=${{ secrets.ANSIBLE_GALAXY_APIKEY }}
-e collection_repo=https://github.com/${{ github.repository }}
--skip-tags=install,cleanup
...
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ jobs:
run: |
sudo cp .github/workflow-config/.pre-commit-config.yml .pre-commit-config.yaml
- uses: pre-commit/[email protected]
...
1 change: 1 addition & 0 deletions roles/backup/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@

# Default backup vars, these are default from installer
backup_dest: "{{ tower_working_location }}/"
...
1 change: 1 addition & 0 deletions roles/backup/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ galaxy_info:

dependencies:
- redhat_cop.tower_utilities.pre_tasks
...
1 change: 1 addition & 0 deletions roles/backup/tasks/backup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
async: 10000
poll: 20
changed_when: false # these will always run and will always report “changed” otherwise
...
1 change: 1 addition & 0 deletions roles/backup/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
- include_tasks: backup.yml
tags:
- backup
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ git_projects_dir: projects
git_projects:
- first-git-project
- second-git-project
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ galaxy_info:
- git

dependencies: []
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/tasks/git_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
user: "{{ git_server_user }}"
state: present
key: "{{ user_result.ssh_public_key }}"
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@
msg: >
Git repos can be used with e.g.
'git clone {{ git_client_users[0].name }}@{{ ansible_host }}:{{ full_projects_dir }}/{{ git_projects[0] }}.git'
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
remote_user: ansible
roles:
- git_ssh_setup
...
1 change: 1 addition & 0 deletions roles/git_ssh_setup/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# list of software we need to setup our minimal Git server
git_needed_software:
- git
...
1 change: 1 addition & 0 deletions roles/install/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
tower_url: "https://localhost"
tower_server: "{{ tower_url }}"
tower_force_setup: true
...
1 change: 1 addition & 0 deletions roles/install/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ galaxy_info:

dependencies:
- redhat_cop.tower_utilities.pre_tasks
...
1 change: 1 addition & 0 deletions roles/install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
- include_tasks: tower_install.yml
tags:
- tower-install
...
1 change: 1 addition & 0 deletions roles/install_ocp/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ openshift_user: kubeadmin
# persistant volume for pg database details
openshift_pg_pvc_name: postgresql
pvc_claim_size: 10Gi
...
1 change: 1 addition & 0 deletions roles/install_ocp/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ dependencies:
vars:
tower_releases_url: "{{ tower_ocp_releases_url }}"
tower_setup_file: "{{ tower_ocp_setup_file }}"
...
1 change: 1 addition & 0 deletions roles/install_ocp/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
- include_tasks: install_ocp.yml
tags:
- install-ocp
...
1 change: 1 addition & 0 deletions roles/install_ocp/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Use the default tower installation template
pre_tasks_process_template: false
...
1 change: 1 addition & 0 deletions roles/kerberos/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ krb_ticket_lifetime: "24h"
krb_renew_lifetime: "7d"
krb_forwardable: "true"
krb_rdns: "false"
...
1 change: 1 addition & 0 deletions roles/kerberos/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,4 @@ dependencies: []
# List your role dependencies here, one per line.
# Be sure to remove the '[]' above if you add dependencies
# to this list.
...
1 change: 1 addition & 0 deletions roles/kerberos/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@
- " ansible_winrm_server_cert_validation: 'ignore'"
- " If you are communicating with a single domain and don't want to enter usernames as [email protected], but instead username:"
- " ansible_winrm_realm: 'YOURDOMAINHERE.COM'"
...
1 change: 1 addition & 0 deletions roles/kerberos/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ krb_req_pkgs:
krb_pip_pkgs:
- "pywinrm>=0.3.0"
- "pywinrm[kerberos]"
...
1 change: 1 addition & 0 deletions roles/pre_tasks/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,4 @@ tower_ah_pg_sslmode: prefer
# postgres_use_ssl=False
# postgres_ssl_cert=/path/to/pgsql.crt
# postgres_ssl_key=/path/to/pgsql.key
...
1 change: 1 addition & 0 deletions roles/pre_tasks/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ galaxy_info:
- ansible

dependencies: []
...
1 change: 1 addition & 0 deletions roles/pre_tasks/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@
# - not tower_database_host|bool
# - tower_database_port == tower_ah_pg_port # if the ports are different, something is at least fishy
# - tower_ah_pg_host == ansible_host or tower_ah_pg_host == inventory_hostname
...
1 change: 1 addition & 0 deletions roles/pre_tasks/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
__towerutils_check_packages:
- unzip # required by unarchive module, not present on a minimal/core RHEL
- tar # required by unarchive module, not present on a minimal/core RHEL
...
1 change: 1 addition & 0 deletions roles/restore/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
# Restore location for tower restore
restore_file: "tower-backup-latest.tar.gz"
restore_location: "{{ tower_working_location }}/{{ restore_file }}"
...
1 change: 1 addition & 0 deletions roles/restore/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ galaxy_info:

dependencies:
- redhat_cop.tower_utilities.pre_tasks
...
1 change: 1 addition & 0 deletions roles/restore/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
- include_tasks: restore.yml
tags:
- restore
...
1 change: 1 addition & 0 deletions roles/restore/tasks/restore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
async: 10000
poll: 20
changed_when: false # these will always run and will always report “changed” otherwise
...
1 change: 1 addition & 0 deletions roles/tower_cert/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
tower_cert_location: "{{ playbook_dir }}/tower.cert"
tower_cert_key_location: "{{ playbook_dir }}/tower.key"
...
1 change: 1 addition & 0 deletions roles/tower_cert/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
command: ansible-tower-service restart
tags:
- tower_certs
...
1 change: 1 addition & 0 deletions roles/tower_cert/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ galaxy_info:
- certs

dependencies: []
...
1 change: 1 addition & 0 deletions roles/tower_cert/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
dest: /etc/tower/tower.key
notify:
- Restart Ansible tower service
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ tower_venv_offline_installs: []
# - name: networking
# package_path: pip-deps
# reqts_file: pip-reqts-provisioner.txt
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ galaxy_info:
dependencies: []
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
...
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
- name: "Include tower_virtual_environments"
include_role:
name: "tower_virtual_environments"
...
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ provisioner:
name: ansible
verifier:
name: ansible
...
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
- name: Example assertion
assert:
that: true
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/tasks/backup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
format: gz
mode: 0755
owner: root
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@
- name: Include Backup of the Virtualenv
include_tasks: backup.yml
when: tower_venv_backup|bool
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/tasks/offline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
state: "present"
become: true
loop: "{{ tower_venv_offline_installs }}"
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/tasks/online.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
virtualenv_command: "virtualenv"
state: present
become: true
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/tasks/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
yum:
name: "{{ tower_venv_rpms[ansible_distribution + ansible_distribution_major_version] }}"
state: installed
...
1 change: 1 addition & 0 deletions roles/tower_virtual_environments/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ tower_venv_rpms:
- python3-virtualenv
- krb5-devel
- python3-gssapi
...

0 comments on commit dd5e51b

Please sign in to comment.