Skip to content

Commit c81275f

Browse files
Alex-WelshMoteHue
andcommitted
Apply suggestions from code review
Co-authored-by: Matt Crees <[email protected]>
1 parent f6e25b2 commit c81275f

12 files changed

+19
-13
lines changed

.ansible-lint-ignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file contains ignores rule violations for ansible-lint
1+
# This file contains ignores to rule violations for ansible-lint
22
etc/kayobe/ansible/vault-deploy-barbican.yml fqcn[action-core]
33
etc/kayobe/ansible/vault-generate-backend-tls.yml fqcn[action-core]
44
etc/kayobe/ansible/vault-generate-internal-tls.yml fqcn[action-core]

.github/workflows/stackhpc-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
9797
- name: Linting code 🧪
9898
run: |
99-
ansible-lint -v --force-color -x no-changed-when,risky-file-permissions,run-once,name[template],package-latest,yaml,role-name[path],yaml[line-length] etc/kayobe/ansible/.
99+
ansible-lint -v --force-color etc/kayobe/ansible/.
100100
101101
# A skipped job is treated as success when used as a required status check.
102102
# The registered required status checks refer to the name of the job in the

etc/kayobe/ansible/cephadm-commands-post.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- name: Apply Cephadm role
10+
- name: Apply Cephadm commands role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.commands
1313
vars:

etc/kayobe/ansible/cephadm-commands-pre.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- name: Apply Cephadm role
10+
- name: Apply Cephadm commands role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.commands
1313
vars:

etc/kayobe/ansible/cephadm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- name: Import Cephadm commands pre playbook
77
import_playbook: cephadm-commands-pre.yml
88

9-
- name: Import Cephadm ec profiles playbook
9+
- name: Import Cephadm EC profiles playbook
1010
import_playbook: cephadm-ec-profiles.yml
1111

1212
- name: Import Cephadm crush rules playbook

etc/kayobe/ansible/fix-houston.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
tasks:
2121
- name: Include kolla-ansible host vars
2222
ansible.builtin.include_vars: "{{ kolla_config_path }}/inventory/overcloud/host_vars/{{ inventory_hostname }}"
23+
2324
- name: Create systemd service for -ovs network interface
2425
ansible.builtin.template:
2526
src: fix-houston-interface.service.j2
@@ -31,7 +32,7 @@
3132
notify: reload systemd
3233

3334
- name: Enable and start systemd service for -ovs network interface
34-
ansible.builtin.systemd: # noqa command-instead-of-module
35+
ansible.builtin.systemd:
3536
name: fix-houston-{{ item }}
3637
enabled: true
3738
state: started

etc/kayobe/ansible/pulp-repo-promote-production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: localhost
44
gather_facts: true
55
tasks:
6-
- name: Ensure repository publications exist
6+
- name: Ensure repository distributions exist
77
ansible.builtin.import_role:
88
name: stackhpc.pulp.pulp_distribution
99
vars:

etc/kayobe/ansible/rabbitmq-reset.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
register: inspection
3232

3333
- name: Ensure the {{ container_name }} container is running
34-
ansible.builtin.command: systemctl start kolla-{{ container_name }}-container.service
34+
ansible.builtin.command: systemctl start kolla-{{ container_name }}-container.service # noqa command-instead-of-module
3535
when: inspection.stdout == 'false'
3636

3737
- name: Wait for the {{ container_name }} container to reach state 'Running'
@@ -48,12 +48,16 @@
4848

4949
- name: Stop app
5050
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl stop_app'
51+
5152
- name: Force reset app
5253
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl force_reset'
54+
5355
- name: Start app
5456
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl start_app'
57+
5558
- name: Wait for all nodes to join the cluster
5659
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl await_online_nodes {{ groups['controllers'] | length }}'
60+
5761
- name: Restart OpenStack services
5862
hosts: controllers:compute
5963
become: true

etc/kayobe/ansible/smartmon-tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Install smartmon-tools
2+
- name: Install and set up smartmon-tools
33
hosts: overcloud
44

55
tasks:

etc/kayobe/ansible/stackhpc-openstack-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
ansible.builtin.pip:
4747
name:
4848
- "{{ repo_tmpdir.path }}"
49-
- -r{{ repo_tmpdir.path }}/requirements.txt
49+
- "-r {{ repo_tmpdir.path }}/requirements.txt"
5050
- pytest-html
5151
- pytest-timeout
5252
virtualenv: "{{ sot_venv }}"

etc/kayobe/ansible/vault-deploy-overcloud.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
file: "{{ kayobe_env_config_path }}/vault/overcloud-vault-keys.json"
8484
name: vault_keys
8585

86-
- name: Import vault unseal role
86+
- name: Apply vault unseal role
8787
ansible.builtin.import_role:
8888
name: stackhpc.hashicorp.vault_unseal
8989
vars:
@@ -99,7 +99,7 @@
9999
gather_facts: true
100100
hosts: controllers[0]
101101
tasks:
102-
- name: Import vault pki role
102+
- name: Apply vault pki role
103103
ansible.builtin.import_role:
104104
name: stackhpc.hashicorp.vault_pki
105105
vars:

etc/kayobe/ansible/wazuh-manager.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
ansible.builtin.assert:
3535
that: local_custom_certs_path is not defined
3636
fail_msg: The variable, `local_custom_certs_path`, is no longer used. Please remove this variable.
37-
- name: Apply wazuh indexer role
37+
38+
- name: Apply Wazuh indexer role
3839
hosts: localhost
3940
roles:
4041
- role: wazuh-ansible/wazuh-ansible/roles/wazuh/wazuh-indexer

0 commit comments

Comments
 (0)