From 271300e94c5ac449329ea98d92fc3e9c68e74160 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 12 Jun 2015 16:42:46 +0000 Subject: [PATCH] Try passing in the list of hosts a different way. --- filter_plugins/fedmsg.py | 4 ++-- roles/fedmsg/base/templates/policy.py.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filter_plugins/fedmsg.py b/filter_plugins/fedmsg.py index ff888a88be..50f0dc8b7b 100644 --- a/filter_plugins/fedmsg.py +++ b/filter_plugins/fedmsg.py @@ -1,7 +1,7 @@ import operator -def invert_fedmsg_authz_policy(vars): +def invert_fedmsg_policy(hosts, vars): """ Given hostvars that map hosts -> topics, invert that and return a dict that maps topics -> hosts. @@ -28,5 +28,5 @@ def invert_fedmsg_authz_policy(vars): class FilterModule(object): def filters(self): return { - "invert_fedmsg_authz_policy": invert_fedmsg_authz_policy, + "invert_fedmsg_policy": invert_fedmsg_policy, } diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2 index 85c0739cfa..f307f4ada9 100644 --- a/roles/fedmsg/base/templates/policy.py.j2 +++ b/roles/fedmsg/base/templates/policy.py.j2 @@ -220,7 +220,7 @@ config = dict( {% if env == 'staging' %} # ** policy dynamically generated from inventory vars # See ansible/filter_plugins/fedmsg.py for this inversion filter. - {% for topic, certs in hostvars | invert_fedmsg_authz_policy %} + {% for topic, certs in groups['all'] | invert_fedmsg_policy(hostvars) %} "{{topic}}": [ {% for cert in certs %} "{{ cert }}",{% endfor %}