From 2793b82e1e1f6af58a7894264e37fc34c23f49c3 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 16 Sep 2015 11:18:41 -0600 Subject: [PATCH] Revert "Simplify extra_distros logic" This reverts commit 0e5eaacba746c698315755b2f8464043d8f37910. --- roles/cobbler_profile/tasks/import_distro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/cobbler_profile/tasks/import_distro.yml b/roles/cobbler_profile/tasks/import_distro.yml index 4b30d15..6140ab4 100644 --- a/roles/cobbler_profile/tasks/import_distro.yml +++ b/roles/cobbler_profile/tasks/import_distro.yml @@ -12,7 +12,7 @@ # but it does so in-place without returning any dict. The first few # blobs do the updating; the last actually returns the result. set_fact: - distros: "{{ distros.update(extra_distros) }}{{ distros }}" + distros: "{% for distro in distros.keys() + extra_distros.keys() %}{{ distros[distro].update(extra_distros[distro]|default({})) }}{% endfor %}{{ distros }}" - name: Find distro settings set_fact: -- 2.39.5