From 20e80ff073bbe50e94bad5f996b6fd1c4e75524b Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 9 Oct 2014 19:06:56 +0000
Subject: [PATCH] Differentiate fedmsg setup for cloud and non-cloud hosts.

---
 roles/fedmsg/base/tasks/main.yml              | 28 ++++++++++++++++++-
 .../base/templates/endpoints-external.py.j2   |  8 ++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 roles/fedmsg/base/templates/endpoints-external.py.j2

diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 25e9514f8e..bab022d456 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -37,7 +37,7 @@
 # Our handlers in handlers/restart_services.yml are smart enough to
 # *conditionally* restart these services, only if they are installed on the
 # system.
-- name: setup basic /etc/fedmsg.d/ contents
+- name: setup basic /etc/fedmsg.d/ contents for internal hosts
   template: >
     src="{{ item }}.j2"
     dest="/etc/fedmsg.d/{{ item }}"
@@ -64,6 +64,32 @@
   - pkgdb.py
   - logging.py
   - base.py
+  when: 'persistent-cloud' not in group_names
+  tags:
+  - config
+  - fedmsgdconfig
+  - fedmsg/base
+  notify:
+  - restart httpd
+  - restart fedmsg-gateway
+  - restart fedmsg-hub
+  - restart fedmsg-irc
+  - restart fedmsg-relay
+
+- name: setup basic /etc/fedmsg.d/ contents for cloud hosts
+  template: >
+    src="{{ item }}.j2"
+    dest="/etc/fedmsg.d/{{ item }}"
+    owner=root
+    group=root
+    mode=644
+  with_items:
+  - ssl.py
+  - endpoints-external.py
+  - relay.py
+  - logging.py
+  - base.py
+  when: 'persistent-cloud' in group_names
   tags:
   - config
   - fedmsgdconfig
diff --git a/roles/fedmsg/base/templates/endpoints-external.py.j2 b/roles/fedmsg/base/templates/endpoints-external.py.j2
new file mode 100644
index 0000000000..a88ef409cd
--- /dev/null
+++ b/roles/fedmsg/base/templates/endpoints-external.py.j2
@@ -0,0 +1,8 @@
+
+config = dict(
+    endpoints = {
+        "fedora-infrastructure": [
+            "tcp://hub.fedoraproject.org:9940",
+        ],
+    }
+)