diff options
| author | Matthew Jones <matburt@redhat.com> | 2016-09-09 21:18:18 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2016-09-09 21:18:18 +0200 |
| commit | 807cced57133cefc4c24189e52b0667650f17fb8 (patch) | |
| tree | 362484eacbf246d45f03f18465acf8ebd24e658a /tools | |
| parent | Purge old munin monitors and tools (diff) | |
| download | awx-807cced57133cefc4c24189e52b0667650f17fb8.tar.xz awx-807cced57133cefc4c24189e52b0667650f17fb8.zip | |
Implement a more dynamic celery queue system
* Meant to be a starting point to more efficiently manage work routing
and to balance work across all tower nodes
* Integrate flower as a dev tool that starts alongside other nodes.
Helpful for observing and monitoring the queues/exchanges
* For the moment, force the task manager to only run on one node (not
sure if this is needed)
* Define queues and routes for all task work
* Bump celery version to 3.1.23
* Expose flower through haproxy
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose-cluster.yml | 1 | ||||
| -rw-r--r-- | tools/docker-compose.yml | 1 | ||||
| -rw-r--r-- | tools/docker-compose/haproxy.cfg | 17 |
3 files changed, 19 insertions, 0 deletions
diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml index 86027f8849..1b1dee4041 100644 --- a/tools/docker-compose-cluster.yml +++ b/tools/docker-compose-cluster.yml @@ -11,6 +11,7 @@ services: ports: - "8013:8013" - "1936:1936" + - "5555:5555" tower_1: image: gcr.io/ansible-tower-engineering/tower_devel:${TAG} hostname: tower_1 diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index f34bb25766..08aec5babd 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -12,6 +12,7 @@ services: ports: - "8080:8080" - "8013:8013" + - "5555:5555" links: - postgres - memcached diff --git a/tools/docker-compose/haproxy.cfg b/tools/docker-compose/haproxy.cfg index cfbb3965f7..01d3c94a4a 100644 --- a/tools/docker-compose/haproxy.cfg +++ b/tools/docker-compose/haproxy.cfg @@ -17,6 +17,11 @@ frontend localnodes mode http default_backend nodes +frontend flower + bind *:5555 + mode http + default_backend flower_nodes + backend nodes mode http balance roundrobin @@ -29,6 +34,18 @@ backend nodes server tower_2 tower_2:8013 check server tower_3 tower_3:8013 check +backend flower_nodes + mode http + balance roundrobin + option forwardfor + option http-pretend-keepalive + http-request set-header X-Forwarded-Port %[dst_port] + http-request add-header X-Forwarded-Proto https if { ssl_fc } + #option httpchk HEAD / HTTP/1.1\r\nHost:localhost + server tower_1 tower_1:5555 + server tower_2 tower_2:5555 + server tower_3 tower_3:5555 + listen stats bind *:1936 stats enable |