summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Bean <rbean@redhat.com>2014-07-17 01:40:44 +0000
committerRalph Bean <rbean@redhat.com>2014-07-17 01:40:44 +0000
commit446465702411b407de1fa5bc6925df0a1ca94e36 (patch)
treefc7c24a9d91f094d175cc0b2b762419c01eb26ce
parent9877feee45b583147fe4d9722e94f43a410b8181 (diff)
downloadansible-446465702411b407de1fa5bc6925df0a1ca94e36.tar.gz
ansible-446465702411b407de1fa5bc6925df0a1ca94e36.tar.xz
ansible-446465702411b407de1fa5bc6925df0a1ca94e36.zip
Websocket server config.
-rw-r--r--inventory/group_vars/busgateway1
-rw-r--r--inventory/group_vars/busgateway-stg1
-rw-r--r--playbooks/groups/busgateway.yml5
-rw-r--r--roles/fedmsg/hub/files/websockets.py6
-rw-r--r--roles/fedmsg/hub/tasks/main.yml8
5 files changed, 19 insertions, 2 deletions
diff --git a/inventory/group_vars/busgateway b/inventory/group_vars/busgateway
index c19172c6a..1bc5320d8 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 af3a8c4d3..a52f947b2 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 53f1656c3..51727ec13 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 000000000..b7f627af0
--- /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 975ae2af4..f6f22a2c2 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