From 074dd3f17ac3b827b961a2af57ec9e95a79fbebe Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 10 Jul 2014 19:11:31 +0000
Subject: [PATCH] Try using a jinja2 "default" filter.

---
 inventory/group_vars/jenkins-cloud | 2 --
 playbooks/groups/jenkins-cloud.yml | 4 ++--
 roles/fedmsg/base/tasks/main.yml   | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/inventory/group_vars/jenkins-cloud b/inventory/group_vars/jenkins-cloud
index d28038219d..bbefeaf0a9 100644
--- a/inventory/group_vars/jenkins-cloud
+++ b/inventory/group_vars/jenkins-cloud
@@ -5,8 +5,6 @@ fedmsg_certs:
 - service: shell
   owner: root
   group: root
-  ansible_fqdn: jenkins.cloud.fedoraproject.org
 - service: jenkins
   owner: root
   group: jenkins
-  ansible_fqdn: jenkins.cloud.fedoraproject.org
diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml
index ebd6b7d0ac..778225aca0 100644
--- a/playbooks/groups/jenkins-cloud.yml
+++ b/playbooks/groups/jenkins-cloud.yml
@@ -29,7 +29,6 @@
 
   roles:
    - base
-   - fedmsg/base
 
   tasks:
   - include: "{{ tasks }}/cloud_setup_basic.yml"
@@ -238,7 +237,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
-   - fedmsg/base
+   - name: fedmsg/base
+     fedmsg_fqdn: jenkins.cloud.fedoraproject.org
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 92de01e71e..f507e7a8e6 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -76,7 +76,7 @@
 
 - name: fedmsg certs
   copy: >
-    src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{ansible_fqdn}}.crt"
+    src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}.crt"
     dest=/etc/pki/fedmsg/
     mode=644
     owner={{item['owner']}}
@@ -89,7 +89,7 @@
 
 - name: fedmsg keys
   copy: >
-    src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{ansible_fqdn}}.key"
+    src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}.key"
     dest=/etc/pki/fedmsg/
     mode=0640
     owner={{item['owner']}}