Render kolla_config files for bootc

Signed-off-by: Brendan Shephard <[email protected]>
openstack-k8s-operators · Jan 17, 2025 · cb8217e · cb8217e
1 parent a05603a
commit cb8217e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 12 deletions.
diff --git a/roles/edpm_logrotate_crond/tasks/logrotate_crond.yml b/roles/edpm_logrotate_crond/tasks/logrotate_crond.yml
@@ -26,11 +26,19 @@
       logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
   when: not ansible_local.bootc
 
-- name: Manage logrotate crond containers
-  ansible.builtin.systemd_service:
-    name: edpm-compute@logrotate_crond
-    enabled: true
-    state: started
-  become: true
+- name: Configure logrotate for bootc
   when: ansible_local.bootc
+  block:
+  - name: Render kolla config file
+    ansible.builtin.copy:
+      src: files/logrotate_crond.yaml
+      dest: /var/lib/kolla/config_files/logrotate_crond.json
+      mode: 0644
 
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@logrotate_crond
+      enabled: true
+      state: started
+    become: true
+
diff --git a/roles/edpm_logrotate_crond/tasks/run.yml b/roles/edpm_logrotate_crond/tasks/run.yml
@@ -29,10 +29,18 @@
       logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
   when: not ansible_local.bootc
 
-- name: Manage logrotate crond containers
-  ansible.builtin.systemd_service:
-    name: edpm-compute@logrotate_crond
-    enabled: true
-    state: started
-  become: true
+- name: Configure logrotate for bootc
   when: ansible_local.bootc
+  become: true
+  block:
+  - name: Render kolla config file
+    ansible.builtin.copy:
+      src: files/logrotate_crond.yaml
+      dest: /var/lib/kolla/config_files/logrotate_crond.json
+      mode: 0644
+
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@logrotate_crond
+      enabled: true
+      state: started
diff --git a/roles/edpm_podman/tasks/install.yml b/roles/edpm_podman/tasks/install.yml
@@ -160,3 +160,13 @@
         setype: var_log_t
       become: true
 
+    - name: Ensure /var/lib/kolla/config_files/ exists
+      ansible.builtin.file:
+        path: /var/lib/kolla/config_files
+        state: directory
+        mode: '0750'
+        owner: root
+        group: root
+        setype: container_file_t
+      become: true
+