diff --git a/inventory/group_vars/busgateway b/inventory/group_vars/busgateway index c19172c6a2..1bc5320d8e 100644 --- a/inventory/group_vars/busgateway +++ b/inventory/group_vars/busgateway @@ -11,6 +11,7 @@ tcp_ports: [ 3999, # The fedmsg-relay republishes here. Listeners need to connect. 9941, # The fedmsg-relay listens here. Ephemeral producers connect. 9940, # The fedmsg-gateway republishes here. Proxies need to connect. + 9919, # The websocket server publishes here. Proxies need to connect. ] fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/inventory/group_vars/busgateway-stg b/inventory/group_vars/busgateway-stg index af3a8c4d38..a52f947b2e 100644 --- a/inventory/group_vars/busgateway-stg +++ b/inventory/group_vars/busgateway-stg @@ -11,6 +11,7 @@ tcp_ports: [ 3999, # The fedmsg-relay republishes here. Listeners need to connect. 9941, # The fedmsg-relay listens here. Ephemeral producers connect. 9940, # The fedmsg-gateway republishes here. Proxies need to connect. + 9919, # The websocket server publishes here. Proxies need to connect. ] fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 53f1656c30..51727ec131 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -52,8 +52,9 @@ accelerate: "{{ accelerated }}" roles: - - fedmsg/hub - - fedmsg/datanommer + - role: fedmsg/hub + enable_websocket_server: True + #- fedmsg/datanommer - fedmsg/relay - fedmsg/gateway - role: collectd/fedmsg-service diff --git a/roles/fedmsg/hub/files/websockets.py b/roles/fedmsg/hub/files/websockets.py new file mode 100644 index 0000000000..b7f627af0e --- /dev/null +++ b/roles/fedmsg/hub/files/websockets.py @@ -0,0 +1,6 @@ + +config = { + # The presence of this will cause fedmsg-hub to start its own websocket + # server along with it. + 'moksha.livesocket.websocket.port': 9919, +} diff --git a/roles/fedmsg/hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml index 975ae2af41..f6f22a2c2f 100644 --- a/roles/fedmsg/hub/tasks/main.yml +++ b/roles/fedmsg/hub/tasks/main.yml @@ -10,3 +10,11 @@ - name: fedmsg-hub service service: name=fedmsg-hub state=started enabled=yes + +- name: enable the websocket server if we should + copy: src=websockets.py dest=/etc/fedmsg.d/websockets.py + when: enable_websocket_server + +- name: disable the websocket server if we should.. + file: dest=/etc/fedmsg.d/websockets.py state=absent + when: not enable_websocket_server