diff --git a/inventory/group_vars/notifs-backend b/inventory/group_vars/notifs-backend index 3a9388c6b6..f3b0cab943 100644 --- a/inventory/group_vars/notifs-backend +++ b/inventory/group_vars/notifs-backend @@ -7,4 +7,15 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file +tcp_ports: [ 3000, 3001, 3002, 3003 ] + fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: fmn + owner: root + group: fedmsg diff --git a/inventory/group_vars/notifs-backend-stg b/inventory/group_vars/notifs-backend-stg index 25492830cb..6fa5d88c13 100644 --- a/inventory/group_vars/notifs-backend-stg +++ b/inventory/group_vars/notifs-backend-stg @@ -7,4 +7,15 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file +tcp_ports: [ 3000, 3001, 3002, 3003 ] + fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: fmn + owner: root + group: fedmsg diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index 28e2f2d14b..404f01e138 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -37,6 +37,7 @@ - endpoints-elections.py - endpoints-fedbadges.py - endpoints-fmn-web.py + - endpoints-fmn-backend.py - endpoints-nuancier.py - endpoints-mailman.py - endpoints-summershum.py diff --git a/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 new file mode 100644 index 0000000000..541b28c031 --- /dev/null +++ b/roles/fedmsg/base/templates/endpoints-fmn-backend.py.j2 @@ -0,0 +1,14 @@ +{% if env == 'staging' %} +suffix = 'stg.phx2.fedoraproject.org' +{% else %} +suffix = 'phx2.fedoraproject.org' +{% endif %} + +config = dict( + endpoints={ + "fmn.notifs-backend01": [ + "tcp://notifs-backend01.%s:30%0.2i" % (suffix, i) + for i in range(4) + ], + }, +) diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index d18868a7c0..5e4a413d73 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -46,6 +46,8 @@ config = dict( ] + [ ("fmn.notifs-web0%i" % i, "fmn-notifs-web0%i.%s" % (i, suffix)) for i in range(1, 3) + ] + [ + ("fmn.notifs-backend01", "fmn-notifs-backend01.%s" % suffix), ] + [ ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) for i in range(1, 3)