Skip to content

Commit 94f062b

Browse files
committed
Render kolla_config files for bootc
Signed-off-by: Brendan Shephard <[email protected]>
1 parent 6e03de6 commit 94f062b

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

roles/edpm_logrotate_crond/tasks/logrotate_crond.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,19 @@
2626
logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
2727
when: not ansible_local.bootc
2828

29-
- name: Manage logrotate crond containers
30-
ansible.builtin.systemd_service:
31-
name: edpm-compute@logrotate_crond
32-
enabled: true
33-
state: started
34-
become: true
29+
- name: Configure logrotate for bootc
3530
when: ansible_local.bootc
31+
block:
32+
- name: Render kolla config file
33+
ansible.builtin.copy:
34+
src: files/logrotate_crond.yaml
35+
dest: /var/lib/kolla/config_files/logrotate_crond.json
36+
mode: 0644
3637

38+
- name: Manage logrotate crond containers
39+
ansible.builtin.systemd_service:
40+
name: edpm-compute@logrotate_crond
41+
enabled: true
42+
state: started
43+
become: true
44+

roles/edpm_logrotate_crond/tasks/run.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,18 @@
2929
logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
3030
when: not ansible_local.bootc
3131

32-
- name: Manage logrotate crond containers
33-
ansible.builtin.systemd_service:
34-
name: edpm-compute@logrotate_crond
35-
enabled: true
36-
state: started
37-
become: true
32+
- name: Configure logrotate for bootc
3833
when: ansible_local.bootc
34+
become: true
35+
block:
36+
- name: Render kolla config file
37+
ansible.builtin.copy:
38+
src: files/logrotate_crond.yaml
39+
dest: /var/lib/kolla/config_files/logrotate_crond.json
40+
mode: 0644
41+
42+
- name: Manage logrotate crond containers
43+
ansible.builtin.systemd_service:
44+
name: edpm-compute@logrotate_crond
45+
enabled: true
46+
state: started

roles/edpm_ovn/tasks/run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
block:
5454
- name: Render kolla config file for ovn_controller
5555
ansible.builtin.template:
56-
src: templates/kolla_ovn_controller.yaml
56+
src: templates/kolla_ovn_controller.yaml.j2
5757
dest: /var/lib/kolla/config_files/ovn_controller.json
5858
mode: 0644
5959

roles/edpm_podman/tasks/install.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,13 @@
160160
setype: var_log_t
161161
become: true
162162

163+
- name: Ensure /var/lib/kolla/config_files/ exists
164+
ansible.builtin.file:
165+
path: /var/lib/kolla/config_files
166+
state: directory
167+
mode: '0750'
168+
owner: root
169+
group: root
170+
setype: container_file_t
171+
become: true
172+

0 commit comments

Comments
 (0)