Replace kolla_container_engine with container_engine

Author: m-bull

etc/kayobe/ansible/fixes/hotfix-containers.yml

@@ -24,7 +24,7 @@
         - container_hotfix_container_regex == "" or container_hotfix_command == "" and container_hotfix_files == []
 
     - name: Get list of containers to hotfix
-      ansible.builtin.command: '{{ kolla_container_engine | default("docker") }} ps --format {% raw %}"{{ .Names }}"{% endraw %}'
+      ansible.builtin.command: '{{ container_engine | default("docker") }} ps --format {% raw %}"{{ .Names }}"{% endraw %}'
       register: host_containers
 
     - name: Set fact for containers list
@@ -64,6 +64,6 @@
         state: absent
 
     - name: Restart containers if requested
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} restart {{ item }}"
+      ansible.builtin.command: "{{ container_engine | default('docker') }} restart {{ item }}"
       loop: "{{ containers_list | regex_findall(container_hotfix_container_regex, multiline=True) | list | unique }}"
       when: container_hotfix_restart_containers

etc/kayobe/ansible/fixes/run-container-hotfix.yml

@@ -3,23 +3,23 @@
   when: container_hotfix_files != []
   block:
     - name: Ensure any required directories exist in container(s)
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} mkdir
+      ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} mkdir
         -p {{ item.dest | dirname }}"
       loop: "{{ container_hotfix_files }}"
 
     - name: Copy file into container(s)
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} cp /tmp/hotfix-files/{{ index }} {{ hotfix_container }}:{{ item.dest }}"
+      ansible.builtin.command: "{{ container_engine | default('docker') }} cp /tmp/hotfix-files/{{ index }} {{ hotfix_container }}:{{ item.dest }}"
       loop: "{{ container_hotfix_files }}"
       loop_control:
         index_var: index
 
     - name: Set mode for copied files
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} chmod
+      ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} chmod
         {{ item.mode | default('400') }} {{ item.dest }}"
       loop: "{{ container_hotfix_files }}"
       loop_control:
         index_var: index
 
 - name: Run container_hotfix_command
-  ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
+  ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
   when: container_hotfix_command

etc/kayobe/containers/pulp/post.yml

@@ -10,7 +10,7 @@
 - name: Set the Pulp admin password
   become: true
   command: >-
-    {{ kolla_container_engine | default("docker") }} exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       "pulpcore-manager reset-admin-password -p \"{{ pulp_password }}\""
   no_log: true
@@ -21,7 +21,7 @@
 - name: Manage Pulp content checksums
   become: true
   command: >-
-    {{ kolla_container_engine | default("docker") }} exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       'pulpcore-manager handle-artifact-checksums'
   when:
@@ -31,7 +31,7 @@
 - name: Manage Pulp content image data
   become: true
   command: >-
-    {{ kolla_container_engine | default("docker") }} exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       'pulpcore-manager container-handle-image-data'
 

etc/kayobe/containers/redfish_exporter/post.yml

@@ -2,6 +2,6 @@
 - name: Restart redfish exporter container if config changed
   become: true
   command: >-
-    {{ kolla_container_engine | default("docker") }} kill -s SIGHUP redfish_exporter
+    {{ container_engine | default("docker") }} kill -s SIGHUP redfish_exporter
   when:
     - redfish_exporter_config is changed