Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Matt Crees <[email protected]>
  • Loading branch information
Alex-Welsh and MoteHue committed Dec 2, 2024
1 parent f6e25b2 commit c81275f
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .ansible-lint-ignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file contains ignores rule violations for ansible-lint
# This file contains ignores to rule violations for ansible-lint
etc/kayobe/ansible/vault-deploy-barbican.yml fqcn[action-core]
etc/kayobe/ansible/vault-generate-backend-tls.yml fqcn[action-core]
etc/kayobe/ansible/vault-generate-internal-tls.yml fqcn[action-core]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Linting code 🧪
run: |
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/.
ansible-lint -v --force-color etc/kayobe/ansible/.
# A skipped job is treated as success when used as a required status check.
# The registered required status checks refer to the name of the job in the
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/cephadm-commands-post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- cephadm
- cephadm-commands
tasks:
- name: Apply Cephadm role
- name: Apply Cephadm commands role
ansible.builtin.import_role:
name: stackhpc.cephadm.commands
vars:
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/cephadm-commands-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- cephadm
- cephadm-commands
tasks:
- name: Apply Cephadm role
- name: Apply Cephadm commands role
ansible.builtin.import_role:
name: stackhpc.cephadm.commands
vars:
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/cephadm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- name: Import Cephadm commands pre playbook
import_playbook: cephadm-commands-pre.yml

- name: Import Cephadm ec profiles playbook
- name: Import Cephadm EC profiles playbook
import_playbook: cephadm-ec-profiles.yml

- name: Import Cephadm crush rules playbook
Expand Down
3 changes: 2 additions & 1 deletion etc/kayobe/ansible/fix-houston.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
tasks:
- name: Include kolla-ansible host vars
ansible.builtin.include_vars: "{{ kolla_config_path }}/inventory/overcloud/host_vars/{{ inventory_hostname }}"

- name: Create systemd service for -ovs network interface
ansible.builtin.template:
src: fix-houston-interface.service.j2
Expand All @@ -31,7 +32,7 @@
notify: reload systemd

- name: Enable and start systemd service for -ovs network interface
ansible.builtin.systemd: # noqa command-instead-of-module
ansible.builtin.systemd:
name: fix-houston-{{ item }}
enabled: true
state: started
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/pulp-repo-promote-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
hosts: localhost
gather_facts: true
tasks:
- name: Ensure repository publications exist
- name: Ensure repository distributions exist
ansible.builtin.import_role:
name: stackhpc.pulp.pulp_distribution
vars:
Expand Down
6 changes: 5 additions & 1 deletion etc/kayobe/ansible/rabbitmq-reset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
register: inspection

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

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

- name: Stop app
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl stop_app'

- name: Force reset app
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl force_reset'

- name: Start app
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl start_app'

- name: Wait for all nodes to join the cluster
ansible.builtin.command: docker exec {{ container_name }} /bin/bash -c 'rabbitmqctl await_online_nodes {{ groups['controllers'] | length }}'

- name: Restart OpenStack services
hosts: controllers:compute
become: true
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/smartmon-tools.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Install smartmon-tools
- name: Install and set up smartmon-tools
hosts: overcloud

tasks:
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/stackhpc-openstack-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
ansible.builtin.pip:
name:
- "{{ repo_tmpdir.path }}"
- -r{{ repo_tmpdir.path }}/requirements.txt
- "-r {{ repo_tmpdir.path }}/requirements.txt"
- pytest-html
- pytest-timeout
virtualenv: "{{ sot_venv }}"
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/ansible/vault-deploy-overcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
file: "{{ kayobe_env_config_path }}/vault/overcloud-vault-keys.json"
name: vault_keys

- name: Import vault unseal role
- name: Apply vault unseal role
ansible.builtin.import_role:
name: stackhpc.hashicorp.vault_unseal
vars:
Expand All @@ -99,7 +99,7 @@
gather_facts: true
hosts: controllers[0]
tasks:
- name: Import vault pki role
- name: Apply vault pki role
ansible.builtin.import_role:
name: stackhpc.hashicorp.vault_pki
vars:
Expand Down
3 changes: 2 additions & 1 deletion etc/kayobe/ansible/wazuh-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
ansible.builtin.assert:
that: local_custom_certs_path is not defined
fail_msg: The variable, `local_custom_certs_path`, is no longer used. Please remove this variable.
- name: Apply wazuh indexer role

- name: Apply Wazuh indexer role
hosts: localhost
roles:
- role: wazuh-ansible/wazuh-ansible/roles/wazuh/wazuh-indexer
Expand Down

0 comments on commit c81275f

Please sign in to comment.