aboutsummaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-12-12 12:47:55 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2025-02-20 10:59:30 +0000
commitaf632db5d138253c36a06a6bcd7d6c9b6fa85edc (patch)
tree05cb9f7708b40caeb51c1970ce7baf3bca7f5338 /roles
parent6d44736756e857e7893e572d5f62a5f7f91c4e86 (diff)
downloadkolla-af632db5d138253c36a06a6bcd7d6c9b6fa85edc.tar.gz
kolla-af632db5d138253c36a06a6bcd7d6c9b6fa85edc.zip
CI: Use ansible-lint for CI roles and playbooks
Removing dbus-python deps because now a-c-k handles that. Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/942179 Change-Id: I97a97da73a7ccb27789e979656867e4adfe8a633
Diffstat (limited to 'roles')
-rw-r--r--roles/configure-ephemeral/meta/main.yml4
-rw-r--r--roles/configure-ephemeral/tasks/main.yml14
-rw-r--r--roles/kolla-build-config/tasks/main.yml5
-rw-r--r--roles/kolla-build-deps/tasks/main.yml26
-rw-r--r--roles/kolla-build/tasks/main.yml5
5 files changed, 28 insertions, 26 deletions
diff --git a/roles/configure-ephemeral/meta/main.yml b/roles/configure-ephemeral/meta/main.yml
new file mode 100644
index 000000000..a6b0fd849
--- /dev/null
+++ b/roles/configure-ephemeral/meta/main.yml
@@ -0,0 +1,4 @@
+---
+collections:
+ - ansible.posix
+ - community.general
diff --git a/roles/configure-ephemeral/tasks/main.yml b/roles/configure-ephemeral/tasks/main.yml
index 7d6402c30..d8733a8f9 100644
--- a/roles/configure-ephemeral/tasks/main.yml
+++ b/roles/configure-ephemeral/tasks/main.yml
@@ -3,7 +3,7 @@
# unallocated ephemeral device attached at /dev/xvde
- name: Set ephemeral device if /dev/xvde exists
when: ansible_devices["xvde"] is defined
- set_fact:
+ ansible.builtin.set_fact:
ephemeral_device: "/dev/xvde"
# On other providers, we have a device called "ephemeral0".
@@ -11,15 +11,15 @@
when: ephemeral_device is undefined
block:
- name: Get ephemeral0 device node
- command: /sbin/blkid -L ephemeral0
+ ansible.builtin.command: /sbin/blkid -L ephemeral0
register: ephemeral0
# rc !=0 is expected
- failed_when: False
- changed_when: False
+ failed_when: false
+ changed_when: false
- name: Set ephemeral device if LABEL exists
when: "ephemeral0.rc == 0"
- set_fact:
+ ansible.builtin.set_fact:
ephemeral_device: "{{ ephemeral0.stdout }}"
- name: Configure additional disk (if available)
@@ -53,13 +53,13 @@
fstype: ext4
dev: "{{ ephemeral_device }}"
- - name: "Ensure {{ configure_ephemeral_mountpoint }} mountpoint is created"
+ - name: "Ensure mountpoint {{ configure_ephemeral_mountpoint }}"
ansible.builtin.file:
path: "{{ configure_ephemeral_mountpoint }}"
owner: root
group: root
state: directory
- mode: 0755
+ mode: "0755"
- name: Mount additional filesystem
ansible.posix.mount:
diff --git a/roles/kolla-build-config/tasks/main.yml b/roles/kolla-build-config/tasks/main.yml
index f4d7f3eec..4460ceb67 100644
--- a/roles/kolla-build-config/tasks/main.yml
+++ b/roles/kolla-build-config/tasks/main.yml
@@ -1,5 +1,8 @@
---
- name: Ensure kolla-build.conf exists
- template:
+ ansible.builtin.template:
src: kolla-build.conf.j2
dest: "{{ kolla_build_config_path }}"
+ mode: "0660"
+ owner: zuul
+ group: zuul
diff --git a/roles/kolla-build-deps/tasks/main.yml b/roles/kolla-build-deps/tasks/main.yml
index 2863cc060..ebb5f00fa 100644
--- a/roles/kolla-build-deps/tasks/main.yml
+++ b/roles/kolla-build-deps/tasks/main.yml
@@ -3,16 +3,23 @@
ansible.builtin.file:
path: "{{ kolla_logs_dir }}"
state: directory
+ mode: "0755"
+ owner: zuul
+ group: zuul
- name: Dump host info to logs
ansible.builtin.command: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tools/dump_info.sh"
args:
chdir: "{{ kolla_logs_dir }}"
+ changed_when: true
- name: Create dir for kolla build logs
ansible.builtin.file:
path: "{{ kolla_build_logs_dir }}"
state: directory
+ mode: "0755"
+ owner: zuul
+ group: zuul
- name: Install Python3 pip and setuptools
ansible.builtin.package:
@@ -29,23 +36,6 @@
become: true
when: ansible_facts.os_family == "Debian"
-- name: Install dbus-python dependencies on Debian systems
- ansible.builtin.package:
- name:
- - python3-dev
- - libdbus-glib-1-dev
- become: true
- when: ansible_facts.os_family == "Debian"
-
-- name: Install dbus-python dependencies on EL systems
- ansible.builtin.package:
- name:
- - python3-devel
- - dbus-glib-devel
- - dbus-daemon
- become: true
- when: ansible_facts.os_family == "RedHat"
-
- name: Install kolla in a venv
ansible.builtin.pip:
name:
@@ -70,5 +60,5 @@
- name: Ensure container engine socket is world-writable
ansible.builtin.file:
path: "{{ '/run/docker.sock' if container_engine == 'docker' else '/run/podman/podman.sock' }}"
- mode: 0666
+ mode: "0666"
become: true
diff --git a/roles/kolla-build/tasks/main.yml b/roles/kolla-build/tasks/main.yml
index ec09e4f79..e5529f381 100644
--- a/roles/kolla-build/tasks/main.yml
+++ b/roles/kolla-build/tasks/main.yml
@@ -3,6 +3,9 @@
ansible.builtin.template:
src: "{{ kolla_build_template_overrides_path }}"
dest: /etc/kolla/template_overrides.j2
+ mode: "0660"
+ owner: zuul
+ group: zuul
when: kolla_build_template_overrides_path | length > 0
- name: Run kolla-build to template out dockerfiles
@@ -10,9 +13,11 @@
cmd: >-
{{ kolla_build_venv_path }}/bin/kolla-build --template-only
--work-dir {{ kolla_build_logs_dir }}/work_dir
+ changed_when: true
- name: Run kolla-build
vars:
platform: "{{ '--platform linux/arm64' if base_arch == 'aarch64' and base_arch != ansible_facts.architecture }}"
ansible.builtin.command:
cmd: "{{ kolla_build_venv_path }}/bin/kolla-build {{ platform }}"
+ changed_when: true