From: Zack Cerza <zack@redhat.com>
Date: Wed, 16 Sep 2015 17:18:41 +0000 (-0600)
Subject: Revert "Simplify extra_distros logic"
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2793b82e1e1f6af58a7894264e37fc34c23f49c3;p=ceph-cm-ansible.git

Revert "Simplify extra_distros logic"

This reverts commit 0e5eaacba746c698315755b2f8464043d8f37910.
---

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: