From 5ed97e0f659a2831cd4ad8c6ad82cb8e29fb3079 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 13 Sep 2019 11:50:06 -0400 Subject: [PATCH] change the default port range for the sdb debugging tool the current range conflicts w/ a port used by the pycharm editor --- CONTRIBUTING.md | 2 +- docs/debugging.md | 4 ++-- tools/docker-compose-cluster.yml | 5 +++-- tools/docker-compose.yml | 4 +++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc380e5dfd..c18bafa152 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -156,7 +156,7 @@ If you start a second terminal session, you can take a look at the running conta $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -aa4a75d6d77b gcr.io/ansible-tower-engineering/awx_devel:devel "/tini -- /bin/sh ..." 23 seconds ago Up 15 seconds 0.0.0.0:5555->5555/tcp, 0.0.0.0:6899-6999->6899-6999/tcp, 0.0.0.0:8013->8013/tcp, 0.0.0.0:8043->8043/tcp, 22/tcp, 0.0.0.0:8080->8080/tcp tools_awx_1 +aa4a75d6d77b gcr.io/ansible-tower-engineering/awx_devel:devel "/tini -- /bin/sh ..." 23 seconds ago Up 15 seconds 0.0.0.0:5555->5555/tcp, 0.0.0.0:7899-7999->7899-7999/tcp, 0.0.0.0:8013->8013/tcp, 0.0.0.0:8043->8043/tcp, 22/tcp, 0.0.0.0:8080->8080/tcp tools_awx_1 e4c0afeb548c postgres:10 "docker-entrypoint..." 26 seconds ago Up 23 seconds 5432/tcp tools_postgres_1 0089699d5afd tools_logstash "/docker-entrypoin..." 26 seconds ago Up 25 seconds tools_logstash_1 4d4ff0ced266 memcached:alpine "docker-entrypoint..." 26 seconds ago Up 25 seconds 0.0.0.0:11211->11211/tcp tools_memcached_1 diff --git a/docs/debugging.md b/docs/debugging.md index eeed1560bc..ea2a6da0c8 100644 --- a/docs/debugging.md +++ b/docs/debugging.md @@ -70,10 +70,10 @@ a telnet session: def run(self, pk, **kwargs): # This will set a breakpoint and open an interactive Python - # debugger exposed on a random port between 6899-6999. The chosen + # debugger exposed on a random port between 7899-7999. The chosen # port will be reported as a warning in the Tower logs, e.g., # - # [2017-01-30 22:26:04,366: WARNING/Worker-11] Remote Debugger:6900: Please telnet into 0.0.0.0 6900. + # [2017-01-30 22:26:04,366: WARNING/Worker-11] Remote Debugger:7900: Please telnet into 0.0.0.0 7900. # # You can access it from your host machine using telnet: # diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml index 3975f35b2b..1c1f5721b8 100644 --- a/tools/docker-compose-cluster.yml +++ b/tools/docker-compose-cluster.yml @@ -46,12 +46,13 @@ services: RABBITMQ_PASS: guest RABBITMQ_VHOST: / SDB_HOST: 0.0.0.0 - SDB_PORT: 6899 + SDB_PORT: 7899 AWX_GROUP_QUEUES: bravo,tower volumes: - "../:/awx_devel" ports: - - "6899-6999:6899-6999" + - "6899:6899" + - "7899-7999:7899-7999" awx_3: user: ${CURRENT_UID} container_name: tools_awx_3_1 diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index e09a7136e1..26f3e7d0b1 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -15,13 +15,15 @@ services: RABBITMQ_PASS: guest RABBITMQ_VHOST: / SDB_HOST: 0.0.0.0 + SDB_PORT: 7899 AWX_GROUP_QUEUES: tower ports: - "8888:8888" - "8080:8080" - "8013:8013" - "8043:8043" - - "6899-6999:6899-6999" # default port range for sdb-listen + - "6899:6899" # default port range for sdb-listen + - "7899-7999:7899-7999" # default port range for sdb-listen links: - postgres - memcached