zuul/zuul-jobs
Code Issues Proposed changes

Bits to keep ansible-lint happy

Browse Source 
- moved vars file under vars to avoid failure to load file (newer
  version raise error if you try to put vars outside vars/defaults as
  it will assume they are broken playbooks.
- added missing file-modes on few tasks

Change-Id: I7217469d089b655ee16cd038391cffa4197c8c83
Part-Of: https://review.opendev.org/c/zuul/zuul-jobs/+/773245
This commit is contained in:
Sorin Sbarnea 2021-03-08 13:42:13 +00:00
parent ad3167bd56
commit 59dad009e9
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/tox/pre-molecule.yaml
View File

@ -9,12 +9,12 @@
with_first_found: with_first_found:
- skip: true - skip: true
files: files:
- "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml" - "vars/molecule/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml"
- "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - "vars/molecule/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml"
- "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - "vars/molecule/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml"
- "molecule-vars/{{ ansible_distribution | lower }}.yaml" - "vars/molecule/{{ ansible_distribution | lower }}.yaml"
- "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml" - "vars/molecule/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml"
- "molecule-vars/{{ ansible_os_family | lower }}.yaml" - "vars/molecule/{{ ansible_os_family | lower }}.yaml"
tags: tags:
- always - always

0
playbooks/tox/molecule-vars/redhat-7.yaml → playbooks/tox/vars/molecule/redhat-7.yaml
View File

0
playbooks/tox/molecule-vars/redhat-8.yaml → playbooks/tox/vars/molecule/redhat-8.yaml
View File

2
roles/ensure-openshift/tasks/main.yaml
View File

@ -22,6 +22,7 @@
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
dest: /etc/yum.repos.d/origin-pass.repo dest: /etc/yum.repos.d/origin-pass.repo
mode: 0644
# https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-PaaS # https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-PaaS
- name: "Install RPM-GPG-KEY-CentOS-SIG-PaaS" - name: "Install RPM-GPG-KEY-CentOS-SIG-PaaS"
@ -49,6 +50,7 @@
=CVSF =CVSF
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
mode: 0644
- name: Install requirements - name: Install requirements
yum: yum:

1
roles/ensure-zookeeper/tasks/setup_tls.yaml
View File

@ -8,6 +8,7 @@
path: "{{ zookeeper_ca_dir }}" path: "{{ zookeeper_ca_dir }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user }}"
mode: 0755
become: true become: true
- name: Copy zk-ca script - name: Copy zk-ca script