Skip to content

Commit 9a301fb

Browse files
committed
fix: linting issues
1 parent d0de34b commit 9a301fb

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

doc/source/configuration/ci-cd.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Runner Deployment
220220
In this example we have two runners, one for production and one for staging and will both be deployed on the same host.
221221
This might not be possible for all deployments as multiple environments may require different runners as no single runner can serve all environments.
222222
Note a GitLab runner can run multiple jobs concurrently so deploying a single runner per environment is recommended.
223-
223+
224224
.. code-block:: yaml
225225
226226
---
@@ -357,7 +357,7 @@ GitLab Pipelines
357357
1. Edit :code:`${KAYOBE_CONFIG_PATH}/inventory/group_vars/gitlab-writer/writer.yml` in the base configuration making the appropriate changes to your deployments specific needs. See documentation for `stackhpc.kayobe_workflows.gitlab <https://github.com/stackhpc/ansible-collection-kayobe-workflows/tree/main/roles/gitlab>`__.
358358
Following the instructions in the documentation will allow you to customise the workflows to fit within your deployment.
359359
For example disabling jobs that might not be relevant such as physical network configuration or overcloud host provision in clouds where this is absent.
360-
Also consider the impact runbooks might have as the runbooks are designed with a particular cloud in mind and may not be suitable for all deployments such as hyperconverged deployments with Ceph on hypervisors.
360+
Also consider the impact runbooks might have as the runbooks are designed with a particular cloud in mind and may not be suitable for all deployments such as hyperconverged deployments with Ceph on hypervisors.
361361
362362
2. Run :code:`kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/write-gitlab-pipelines.yml`
363363

etc/kayobe/ansible/deploy-openbao-kayobe-automation.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,29 @@
55
hosts: github-runners,gitlab-runners
66
tasks:
77
- name: Set a fact about the virtualenv on the remote system
8-
set_fact:
8+
ansible.builtin.set_fact:
99
virtualenv: "{{ ansible_python_interpreter | dirname | dirname }}"
1010
when:
1111
- ansible_python_interpreter is defined
1212
- not ansible_python_interpreter.startswith('/bin/')
1313
- not ansible_python_interpreter.startswith('/usr/bin/')
1414

1515
- name: Ensure Python hvac module is installed
16-
pip:
16+
ansible.builtin.pip:
1717
name: hvac
1818
state: latest
1919
extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
2020
virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}"
2121
become: "{{ virtualenv is not defined }}"
2222

2323
- name: Ensure /opt/kayobe/vault exists
24-
file:
24+
ansible.builtin.file:
2525
path: /opt/kayobe/vault
2626
state: directory
2727
become: true
2828

29-
- import_role:
29+
- name: Import OpenBao role
30+
ansible.builtin.import_role:
3031
name: stackhpc.hashicorp.openbao
3132
vars:
3233
openbao_config_dir: "/opt/kayobe/vault"
@@ -36,12 +37,13 @@
3637
openbao_write_keys_file_path: "{{ kayobe_env_config_path }}/vault/kayobe-automation-keys.json"
3738

3839
- name: Include OpenBao keys
39-
include_vars:
40+
ansible.builtin.include_vars:
4041
file: "{{ kayobe_env_config_path }}/vault/kayobe-automation-keys.json"
4142
name: openbao_keys
4243
tags: always
4344

44-
- import_role:
45+
- name: Import Vault unseal role
46+
ansible.builtin.import_role:
4547
name: stackhpc.hashicorp.vault_unseal
4648
vars:
4749
vault_api_addr: "{{ openbao_api_addr }}"

0 commit comments

Comments
 (0)