Skip to content

Commit b9114e5

Browse files
committed
Ansible-lint revert line-length limit
1 parent 0be7a56 commit b9114e5

File tree

7 files changed

+12
-23
lines changed

7 files changed

+12
-23
lines changed

.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] etc/kayobe/ansible/.
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/.
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/build-ofed-rocky.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242

4343
- name: Add DOCA host repository package
4444
ansible.builtin.dnf:
45-
name: "https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_\
46-
{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm"
45+
name: "https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm"
4746
disable_gpg_check: true
4847

4948
- name: Install DOCA extra packages

etc/kayobe/ansible/deploy-os-capacity-exporter.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,12 @@
3131

3232
- name: Set facts for admin credentials
3333
ansible.builtin.set_fact:
34-
stackhpc_os_capacity_auth_url: "{{ credential.stdout_lines | select('match', '.*OS_AUTH_URL*.') \
35-
| first | split('=') | last | replace(\"'\", '') }}"
36-
stackhpc_os_capacity_project_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_NAME*.') \
37-
| first | split('=') | last | replace(\"'\", '') }}"
38-
stackhpc_os_capacity_domain_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_DOMAIN_NAME*.') \
39-
| first | split('=') | last | replace(\"'\", '') }}"
40-
stackhpc_os_capacity_openstack_region_name: "{{ credential.stdout_lines | select('match', '.*OS_REGION_NAME*.') \
41-
| first | split('=') | last | replace(\"'\", '') }}"
42-
stackhpc_os_capacity_username: "{{ credential.stdout_lines | select('match', '.*OS_USERNAME*.') \
43-
| first | split('=') | last | replace(\"'\", '') }}"
44-
stackhpc_os_capacity_password: "{{ credential.stdout_lines | select('match', '.*OS_PASSWORD*.') \
45-
| first | split('=') | last | replace(\"'\", '') }}"
34+
stackhpc_os_capacity_auth_url: "{{ credential.stdout_lines | select('match', '.*OS_AUTH_URL*.') first | split('=') | last | replace(\"'\", '') }}"
35+
stackhpc_os_capacity_project_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_NAME*.') first | split('=') | last | replace(\"'\", '') }}"
36+
stackhpc_os_capacity_domain_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_DOMAIN_NAME*.') first | split('=') | last | replace(\"'\", '') }}"
37+
stackhpc_os_capacity_openstack_region_name: "{{ credential.stdout_lines | select('match', '.*OS_REGION_NAME*.') first | split('=') | last | replace(\"'\", '') }}"
38+
stackhpc_os_capacity_username: "{{ credential.stdout_lines | select('match', '.*OS_USERNAME*.') first | split('=') | last | replace(\"'\", '') }}"
39+
stackhpc_os_capacity_password: "{{ credential.stdout_lines | select('match', '.*OS_PASSWORD*.') first | split('=') | last | replace(\"'\", '') }}"
4640
when: stackhpc_enable_os_capacity
4741

4842
- name: Template clouds.yml

etc/kayobe/ansible/run-container-hotfix.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
index_var: index
2222

2323
- name: Run container_hotfix_command
24-
ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec \
25-
{{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
24+
ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
2625
when: container_hotfix_command

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
vars:
9090
vault_api_addr: https://{{ internal_net_name | net_ip }}:8200
9191
vault_unseal_token: "{{ vault_keys.root_token }}"
92-
vault_unseal_ca_cert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if ansible_facts.os_family == 'RedHat' \
93-
else '/usr/local/share/ca-certificates/OS-TLS-ROOT.crt' }}"
92+
vault_unseal_ca_cert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if ansible_facts.os_family == 'RedHat' else '/usr/local/share/ca-certificates/OS-TLS-ROOT.crt' }}"
9493
vault_unseal_keys: "{{ vault_keys.keys_base64 }}"
9594
environment:
9695
https_proxy: ""

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
- common_name: "{% if kolla_internal_fqdn != kolla_internal_vip_address %}{{ kolla_internal_fqdn }}{% else %}overcloud{% endif %}"
7878
role: "{{ seed_vault_pki_role_name }}"
7979
extra_params:
80-
ip_sans: "{% for host in groups['controllers'] %}{{ internal_net_name | net_ip(host) }}\
81-
{% if not loop.last %},{% endif %}{% endfor %},{{ kolla_internal_vip_address }}"
80+
ip_sans: "{% for host in groups['controllers'] %}{{ internal_net_name | net_ip(host) }}{% if not loop.last %},{% endif %}{% endfor %},{{ kolla_internal_vip_address }}"
8281
vault_pki_write_certificate_files: true
8382
vault_pki_write_pem_bundle: false
8483
vault_pki_write_int_ca_to_file: true

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
vars:
3232
vault_api_addr: https://{{ internal_net_name | net_ip }}:8200
3333
vault_unseal_token: "{{ vault_keys.root_token }}"
34-
vault_unseal_ca_cert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if ansible_facts.os_family == 'RedHat' \
35-
else '/usr/local/share/ca-certificates/OS-TLS-ROOT.crt' }}"
34+
vault_unseal_ca_cert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if ansible_facts.os_family == 'RedHat' else '/usr/local/share/ca-certificates/OS-TLS-ROOT.crt' }}"
3635
vault_unseal_keys: "{{ vault_keys.keys_base64 }}"
3736
environment:
3837
https_proxy: ""

0 commit comments

Comments
 (0)