From: David Galloway <dgallowa@redhat.com>
Date: Thu, 23 Dec 2021 16:53:14 +0000 (-0500)
Subject: container-host: distro-specific secrets file
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F664%2Fhead;p=ceph-cm-ansible.git

container-host: distro-specific secrets file

`container_packages` was getting set to `podman` for all downstream distros.  That won't work for Ubuntu so we'll use distro-specific secrets overrides.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/container-host/tasks/main.yml b/roles/container-host/tasks/main.yml
index 42001a3..83f5013 100644
--- a/roles/container-host/tasks/main.yml
+++ b/roles/container-host/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: Including distro specific variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ secrets_path }}/container-host.yml"
+    - "{{ secrets_path }}/container-host/{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml"
     - "{{ package_manager }}_systems.yml"
     - empty.yml