From f02d60f92758ef0acb062952f0c02c895cf61dc4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 28 Sep 2015 18:50:29 +0000 Subject: [PATCH] Add global fedmsg config for autocloud-backend nodes. --- inventory/group_vars/autocloud-backend | 8 ++++---- inventory/group_vars/autocloud-backend-stg | 8 ++++---- roles/fedmsg/base/tasks/main.yml | 1 + .../base/templates/endpoints-autocloud.py.j2 | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 roles/fedmsg/base/templates/endpoints-autocloud.py.j2 diff --git a/inventory/group_vars/autocloud-backend b/inventory/group_vars/autocloud-backend index cdcf04328f..fa5fc2557b 100644 --- a/inventory/group_vars/autocloud-backend +++ b/inventory/group_vars/autocloud-backend @@ -7,13 +7,13 @@ num_cpus: 4 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 3000, 3001, 3002, 3003, 3004 ] +tcp_ports: [ + # These four ports are for outbound fedmsg + 3000, 3001, 3002, 3003, +] fas_client_groups: sysadmin-noc,sysadmin-fedimg -# This can be removed later after we have set things up -fedmsg_loglevel: DEBUG - # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/inventory/group_vars/autocloud-backend-stg b/inventory/group_vars/autocloud-backend-stg index cdcf04328f..fa5fc2557b 100644 --- a/inventory/group_vars/autocloud-backend-stg +++ b/inventory/group_vars/autocloud-backend-stg @@ -7,13 +7,13 @@ num_cpus: 4 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 3000, 3001, 3002, 3003, 3004 ] +tcp_ports: [ + # These four ports are for outbound fedmsg + 3000, 3001, 3002, 3003, +] fas_client_groups: sysadmin-noc,sysadmin-fedimg -# This can be removed later after we have set things up -fedmsg_loglevel: DEBUG - # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index e74425d961..338bb23c99 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -85,6 +85,7 @@ - endpoints-fedimg.py - endpoints-bugzilla2fedmsg.py - endpoints-bodhi.py + - endpoints-autocloud.py - relay.py - logging.py - base.py diff --git a/roles/fedmsg/base/templates/endpoints-autocloud.py.j2 b/roles/fedmsg/base/templates/endpoints-autocloud.py.j2 new file mode 100644 index 0000000000..e53e38dc72 --- /dev/null +++ b/roles/fedmsg/base/templates/endpoints-autocloud.py.j2 @@ -0,0 +1,18 @@ +{% if env == 'staging' %} +suffix = 'stg.phx2.fedoraproject.org' +{% else %} +suffix = 'phx2.fedoraproject.org' +{% endif %} + +config = dict( + endpoints={ + "autocloud.autocloud-backend01": [ + "tcp://autocloud-backend01.%s:30%0.2i" % (suffix, i) + for i in range(4) + ], + "autocloud.autocloud-backend02": [ + "tcp://autocloud-backend02.%s:30%0.2i" % (suffix, i) + for i in range(4) + ], + }, +)