Merge pull request #382 from stackhpc/upstream/master-2025-02-03

Synchronise master with upstream

Author: priteau

ansible/action_plugins/kayobe_container.py

@@ -0,0 +1,25 @@
+from ansible.plugins.action import ActionBase
+
+_engine_to_module = {
+   'docker': 'community.docker.docker_container',
+   'podman': 'containers.podman.podman_container'
+}
+
+class ActionModule(ActionBase):
+    def run(self, tmp=None, task_vars=None):
+        super(ActionModule, self).run(tmp, task_vars)
+        module_args = self._task.args.copy()
+        engine = task_vars.get("container_engine", "docker")
+        if engine == "podman":
+            auto_remove = module_args.pop('cleanup', None)
+            if auto_remove:
+                module_args["auto_remove"] = True
+            # TODO(wszumski): Drop unsupported arguments. In the future
+            # we could emulate these options.
+            module_args.pop('timeout', None)
+            module_args.pop('comparisons', None)
+        module = _engine_to_module.get(engine)
+        module_return = self._execute_module(module_name=module,
+                                             module_args=module_args,
+                                             task_vars=task_vars, tmp=tmp)
+        return module_return

ansible/action_plugins/kayobe_container_image.py

@@ -0,0 +1,28 @@
+from ansible.errors import AnsibleError
+from ansible.plugins.action import ActionBase
+
+_engine_to_module = {
+   'docker': 'community.docker.docker_image',
+   'podman': 'containers.podman.podman_image'
+}
+
+class ActionModule(ActionBase):
+    def run(self, tmp=None, task_vars=None):
+        super(ActionModule, self).run(tmp, task_vars)
+        module_args = self._task.args.copy()
+        engine = task_vars.get("container_engine", "docker")
+        if engine == "podman":
+            # Translate from docker args
+            source = module_args["source"]
+            if source == "build":
+                module_args["state"] = "build"
+            elif source == "pull":
+                module_args["pull"] = True
+            else:
+                raise AnsibleError(f'Unsupported source parameter: {source}')
+            del module_args["source"]
+        module = _engine_to_module.get(engine)
+        module_return = self._execute_module(module_name=module,
+                                             module_args=module_args,
+                                             task_vars=task_vars, tmp=tmp)
+        return module_return

ansible/action_plugins/kayobe_container_image_info.py

@@ -0,0 +1,17 @@
+from ansible.plugins.action import ActionBase
+
+_engine_to_module = {
+   'docker': 'community.docker.docker_image_info',
+   'podman': 'containers.podman.podman_image_info'
+}
+
+class ActionModule(ActionBase):
+    def run(self, tmp=None, task_vars=None):
+        super(ActionModule, self).run(tmp, task_vars)
+        module_args = self._task.args.copy()
+        engine = task_vars.get("container_engine", "docker")
+        module = _engine_to_module.get(engine)
+        module_return = self._execute_module(module_name=module,
+                                             module_args=module_args,
+                                             task_vars=task_vars, tmp=tmp)
+        return module_return

ansible/action_plugins/kayobe_container_login.py

@@ -0,0 +1,24 @@
+from ansible.plugins.action import ActionBase
+
+_engine_to_module = {
+   'docker': 'community.docker.docker_login',
+   'podman': 'containers.podman.podman_login'
+}
+
+class ActionModule(ActionBase):
+    def run(self, tmp=None, task_vars=None):
+        super(ActionModule, self).run(tmp, task_vars)
+        module_args = self._task.args.copy()
+        engine = task_vars.get("container_engine", "docker")
+        module = _engine_to_module.get(engine)
+        if engine == "podman":
+            # Drop unspported arguments
+            module_args.pop("reauthorize", None)
+            # Rename arguments that differ from docker
+            if module_args.get("registry_url"):
+                module_args["registry"] = module_args["registry_url"]
+                del module_args["registry_url"]
+        module_return = self._execute_module(module_name=module,
+                                             module_args=module_args,
+                                             task_vars=task_vars, tmp=tmp)
+        return module_return

ansible/action_plugins/kayobe_container_volume.py

@@ -0,0 +1,17 @@
+from ansible.plugins.action import ActionBase
+
+_engine_to_module = {
+   'docker': 'community.docker.docker_volume',
+   'podman': 'containers.podman.podman_volume'
+}
+
+class ActionModule(ActionBase):
+    def run(self, tmp=None, task_vars=None):
+        super(ActionModule, self).run(tmp, task_vars)
+        module_args = self._task.args.copy()
+        engine = task_vars.get("container_engine", "docker")
+        module = _engine_to_module.get(engine)
+        module_return = self._execute_module(module_name=module,
+                                             module_args=module_args,
+                                             task_vars=task_vars, tmp=tmp)
+        return module_return

ansible/container-engine.yml

@@ -0,0 +1,37 @@
+---
+- name: Ensure docker is configured
+  hosts: container-engine
+  max_fail_percentage: >-
+    {{ container_engine_max_fail_percentage |
+       default(docker_max_fail_percentage) |
+       default(host_configure_max_fail_percentage) |
+       default(kayobe_max_fail_percentage) |
+       default(100) }}
+  tags:
+    - docker
+    - container-engine
+  tasks:
+    - include_role:
+        name: docker
+      vars:
+        docker_daemon_mtu: "{{ public_net_name | net_mtu | default }}"
+        docker_configure_for_zun: "{{ kolla_enable_zun | bool }}"
+        docker_http_proxy: "{{ kolla_http_proxy }}"
+        docker_https_proxy: "{{ kolla_https_proxy }}"
+        docker_no_proxy: "{{ kolla_no_proxy | select | join(',') }}"
+      when: container_engine == "docker"
+
+- name: Ensure podman is configured
+  hosts: container-engine
+  max_fail_percentage: >-
+    {{ container_engine_max_fail_percentage |
+       default(host_configure_max_fail_percentage) |
+       default(kayobe_max_fail_percentage) |
+       default(100) }}
+  tags:
+    - podman
+    - container-engine
+  tasks:
+    - include_role:
+        name: openstack.kolla.podman
+      when: container_engine == "podman"

ansible/container-image-build.yml

@@ -34,15 +34,16 @@
         group: "{{ ansible_facts.user_gid }}"
       become: True
 
-    - name: Login to docker registry
-      docker_login:
+    - name: Login to container registry
+      kayobe_container_login:
         registry_url: "{{ kolla_docker_registry or omit }}"
         username: "{{ kolla_docker_registry_username }}"
         password: "{{ kolla_docker_registry_password }}"
         reauthorize: yes
       when:
         - kolla_docker_registry_username is truthy
         - kolla_docker_registry_password is truthy
+      become: "{{ container_engine == 'podman' }}"
 
     - name: Ensure Kolla container images are built
       shell:
@@ -51,6 +52,7 @@
           . {{ kolla_venv }}/bin/activate &&
           kolla-build
           --config-dir {{ kolla_build_config_path }}
+          --engine {{ container_engine }}
           {% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %}
           {% if push_images | bool %}--push{% endif %}
           {% if nocache | bool %}--nocache{% endif %}
@@ -59,3 +61,4 @@
         executable: /bin/bash
       with_items: "{{ container_image_sets }}"
       when: item.regexes != ''
+      become: "{{ container_engine == 'podman' }}"

ansible/docker.yml

@@ -21,4 +21,4 @@
 - import_playbook: "mdadm.yml"
 - import_playbook: "luks.yml"
 - import_playbook: "lvm.yml"
-- import_playbook: "docker.yml"
+- import_playbook: "container-engine.yml"

ansible/infra-vm-host-configure.yml

@@ -83,7 +83,9 @@ compute_lvm_groups_default: "{{ [compute_lvm_group_data] if compute_lvm_group_da
 compute_lvm_groups_extra: []
 
 # Whether a 'data' LVM volume group should exist on compute hosts. By default
-# this contains a 'docker-volumes' logical volume for Docker volume storage
+# this contains a 'docker-volumes' logical volume for container volume storage
+# if using the docker container engine, or a 'podman-volumes' logical volume
+# for container volume storage if using the podman container engine.
 # Default is false.
 compute_lvm_group_data_enabled: false
 
@@ -100,25 +102,47 @@ compute_lvm_group_data:
 compute_lvm_group_data_disks:
   - changeme
 
-# List of LVM logical volumes for the data volume group.
-compute_lvm_group_data_lvs:
+# List of LVM logical volumes for the data volume group when using docker.
+compute_lvm_group_data_docker_lvs:
   - "{{ compute_lvm_group_data_lv_docker_volumes }}"
 
+# List of LVM logical volumes for the data volume group when using podman.
+compute_lvm_group_data_podman_lvs:
+  - "{{ compute_lvm_group_data_lv_podman_volumes }}"
+
+# List of LVM logical volumes for the data volume group.
+compute_lvm_group_data_lvs: "{{ compute_lvm_group_data_podman_lvs if container_engine == 'podman' else compute_lvm_group_data_docker_lvs }}"
+
 # Docker volumes LVM backing volume.
 compute_lvm_group_data_lv_docker_volumes:
   lvname: docker-volumes
   size: "{{ compute_lvm_group_data_lv_docker_volumes_size }}"
   create: True
   filesystem: "{{ compute_lvm_group_data_lv_docker_volumes_fs }}"
   mount: True
-  mntp: /var/lib/docker/volumes
+  mntp: "{{ docker_volumes_path }}"
+
+# Podman volumes LVM backing volume.
+compute_lvm_group_data_lv_podman_volumes:
+  lvname: podman-volumes
+  size: "{{ compute_lvm_group_data_lv_podman_volumes_size }}"
+  create: True
+  filesystem: "{{ compute_lvm_group_data_lv_podman_volumes_fs }}"
+  mount: True
+  mntp: "{{ podman_volumes_path }}"
 
 # Size of docker volumes LVM backing volume.
 compute_lvm_group_data_lv_docker_volumes_size: 75%VG
 
 # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
 compute_lvm_group_data_lv_docker_volumes_fs: ext4
 
+# Size of podman volumes LVM backing volume.
+compute_lvm_group_data_lv_podman_volumes_size: 75%VG
+
+# Filesystem for podman volumes LVM backing volume. ext4 allows for shrinking.
+compute_lvm_group_data_lv_podman_volumes_fs: ext4
+
 ###############################################################################
 # Compute node sysctl configuration.