Move fedmsg_base stuff from a task to a role.

Submitted by janeznemanic for
https://fedorahosted.org/fedora-infrastructure/ticket/4011

inventory/group_vars/badges-backend

@@ -11,7 +11,7 @@ tcp_ports: [ 3000 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

inventory/group_vars/badges-backend-stg

@@ -11,7 +11,7 @@ tcp_ports: [ 3000 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

inventory/group_vars/badges-web

@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

inventory/group_vars/badges-web-stg

@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

inventory/group_vars/nuancier

@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-web
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

inventory/group_vars/nuancier-stg

@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-web
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root

playbooks/groups/badges-backend.yml

@@ -37,6 +37,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -46,7 +47,6 @@
   - include: $tasks/sudo.yml
   - include: $tasks/openvpn_client.yml
     when: env != "staging"
-  - include: $tasks/fedmsg_base.yml
 
   handlers:
   - include: $handlers/restart_services.yml

playbooks/groups/badges-web.yml

@@ -38,6 +38,7 @@
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
   - /srv/web/infra/ansible/roles/badges-frontend
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -47,7 +48,6 @@
   - include: $tasks/sudo.yml
   - include: $tasks/openvpn_client.yml
     when: env != "staging"
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
   - include: $tasks/mod_wsgi.yml
 

playbooks/groups/gallery.yml

@@ -37,6 +37,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -44,7 +45,6 @@
   - include: $tasks/2fa_client.yml
   - include: $tasks/motd.yml
   - include: $tasks/sudo.yml
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
 
   handlers:

playbooks/groups/keyserver.yml

@@ -35,6 +35,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -43,7 +44,6 @@
   - include: $tasks/openvpn_client.yml
   - include: $tasks/motd.yml
   - include: $tasks/sudo.yml
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
   - include: $tasks/keyserver.yml
 

playbooks/groups/nuancier.yml

@@ -63,8 +63,8 @@
    - ${private}/vars.yml
    - ${vars}/${ansible_distribution}.yml
 
-  tasks:
-  - include: $tasks/fedmsg_base.yml
+  roles:
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   handlers:
   - include: $handlers/restart_services.yml

roles/fedmsg_base/tasks/main.yml

@@ -15,7 +15,7 @@
   - config
 
 - name: setup basic /etc/fedmsg.d/ contents
-  template: src=$files/fedmsg/$item.j2 dest=/etc/fedmsg.d/$item owner=root group=root mode=644
+  template: src=$item.j2 dest=/etc/fedmsg.d/$item owner=root group=root mode=644
   with_items:
   - ssl.py
   - endpoints.py