Skip to content

Commit b680cbc

Browse files
committed
LINT: Prepend role name to variables
Linting requires variables on roles to have the role name prepended to them
1 parent 2f402d6 commit b680cbc

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

chatops_deployment/ansible/roles/haproxy/tasks/certbot.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
become: true
3636
ansible.builtin.stat:
3737
path: /etc/haproxy/{{ domain }}.crt
38-
register: certificate_file
38+
register: haproxy_certificate_file
3939

4040
- name: Generate the certificate for the first time
4141
become: true
4242
ansible.builtin.command: |
4343
certbot certonly --standalone --non-interactive --agree-tos --expand --domains \
4444
{{ domain }},chatops.{{ domain }},prometheus.{{ domain }},grafana.{{ domain }},alertmanager.{{ domain }},kibana.{{ domain }} \
4545
46-
register: generate_cert
47-
changed_when: generate_cert.rc == 0
48-
when: not certificate_file.stat.exists
46+
register: haproxy_generate_cert
47+
changed_when: haproxy_generate_cert.rc == 0
48+
when: not haproxy_certificate_file.stat.exists
4949

5050
- name: Copy certificate for the first time
5151
become: true
5252
ansible.builtin.command: |
5353
cat /etc/letsencrypt/live/{{ domain }}/privkey.pem \
5454
/etc/letsencrypt/live/{{ domain }}/fullchain.pem > /etc/haproxy/{{ domain }}.crt
55-
register: copy_cert
56-
changed_when: copy_cert.rc == 0
57-
when: not certificate_file.stat.exists
55+
register: haproxy_copy_cert
56+
changed_when: haproxy_copy_cert.rc != 0
57+
when: not haproxy_certificate_file.stat.exists
5858

5959
- name: Create a cron job for the renewal of certificates
6060
become: true
@@ -99,4 +99,4 @@
9999
ansible.builtin.systemd_service:
100100
state: restarted
101101
name: haproxy.service
102-
when: copy_cert.rc == 0
102+
when: haproxy_copy_cert.rc == 0

chatops_deployment/ansible/roles/haproxy/tasks/haproxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
become: true
2020
ansible.builtin.stat:
2121
path: /etc/haproxy/{{ domain }}.crt
22-
register: certificate_file
22+
register: haproxy_certificate_file
2323

2424
- name: Make sure haproxy.service is running
2525
become: true
2626
ansible.builtin.systemd_service:
2727
state: restarted
2828
name: haproxy.service
29-
when: certificate_file.stat.exists
29+
when: haproxy_certificate_file.stat.exists

chatops_deployment/ansible/roles/ssh_known_hosts/tasks/main.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,50 @@
1818
send "{{ bastion_key_passphrase }}\r"
1919
expect eof
2020
EOF
21-
register: _
22-
changed_when: _.rc == 0
21+
register: ssh_known_hosts_
22+
changed_when: ssh_known_hosts_.rc != 0
2323

2424
- name: Remove FIP known hosts
2525
ansible.builtin.command: 'ssh-keygen -R "{{ terraform_floating_ip }}"'
26-
register: _
27-
changed_when: _.rc == 0
26+
register: ssh_known_hosts_
27+
changed_when: ssh_known_hosts_.rc != 0
2828

2929
- name: Remove private VM known host entries
3030
ansible.builtin.command: "ssh-keygen -R {{ item }}"
3131
loop: "{{ groups['private'] }}"
32-
register: _
33-
changed_when: _.rc == 0
32+
register: ssh_known_hosts_
33+
changed_when: ssh_known_hosts_.rc != 0
3434

3535
- name: Add FIP fingerprint to known hosts
3636
ansible.builtin.command: 'ssh-keyscan "{{ terraform_floating_ip }}" >> ~/.ssh/known_hosts'
37-
register: _
38-
changed_when: _.rc == 0
37+
register: ssh_known_hosts_
38+
changed_when: ssh_known_hosts_.rc != 0
3939

4040
- name: Get private VM fingerprints and retrieve to local host
4141
delegate_to: "{{ terraform_floating_ip }}"
4242
block:
4343
- name: Add private VM fingerprints to known hosts on LB
4444
ansible.builtin.command: 'ssh-keyscan "{{ item }}" >> ~/.ssh/known_hosts'
4545
loop: "{{ groups['private'] }}"
46-
register: _
47-
changed_when: _.rc == 0
46+
register: ssh_known_hosts_
47+
changed_when: ssh_known_hosts_.rc != 0
4848

4949
- name: Retrieve known hosts from LB
5050
ansible.builtin.fetch:
5151
src: "~/.ssh/known_hosts"
5252
dest: "private_known_hosts.tmp"
5353
flat: true
54-
register: _
55-
changed_when: _.rc == 0
54+
register: ssh_known_hosts_
55+
changed_when: ssh_known_hosts_.rc != 0
5656

5757
- name: Append fetched known hosts to localhost
5858
ansible.builtin.command: "cat private_known_hosts.tmp >> ~/.ssh/known_hosts"
59-
register: _
60-
changed_when: _.rc == 0
59+
register: ssh_known_hosts_
60+
changed_when: ssh_known_hosts_.rc != 0
6161

6262
- name: Remove private_known_hosts.tmp
6363
ansible.builtin.file:
6464
path: "private_known_hosts.tmp"
6565
state: absent
66-
register: _
67-
changed_when: _.rc == 0
66+
register: ssh_known_hosts_
67+
changed_when: ssh_known_hosts_.rc != 0

chatops_deployment/ansible/roles/terraform/tasks/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
- name: Check clouds.yaml
55
ansible.builtin.stat:
66
path: "~/.config/openstack/clouds.yaml"
7-
register: clouds_yaml_state
7+
register: terraform_clouds_yaml_state
88

99
- name: Fail if clouds.yaml does not exist
1010
ansible.builtin.fail:
1111
msg: "Could not find a clouds.yaml in ~/.config/openstack/clouds.yaml"
12-
when: not clouds_yaml_state.stat.exists
12+
when: not terraform_clouds_yaml_state.stat.exists
1313

1414
- name: Check public and private keys
1515
block:
1616
# We can ignore this warning as this command doesn't change anything when it runs.
1717
- name: Check Bastion public key is valid # noqa: no-changed-when
1818
ansible.builtin.command: "ssh-keygen -l -f '../terraform/bastion-key.pub'"
1919
ignore_errors: true
20-
register: public_key_state
20+
register: terraform_public_key_state
2121

2222
# We can ignore this warning as this command doesn't change anything when it runs.
2323
- name: Check Bastion private key is valid # noqa: no-changed-when
2424
ansible.builtin.command: "ssh-keygen -l -f '../ansible/bastion-key'"
2525
ignore_errors: true
26-
register: private_key_state
26+
register: terraform_private_key_state
2727

2828
- name: Generate an SSH key pair and copy to directories
29-
when: public_key_state.rc != 0 or private_key_state.rc != 0
29+
when: terraform_public_key_state.rc != 0 or terraform_private_key_state.rc != 0
3030
block:
3131
- name: Generate key
3232
community.crypto.openssh_keypair:

0 commit comments

Comments
 (0)