replace rabbitmq with redis

* local awx docker-compose and image build only.
This commit is contained in:
chris meyers
2020-02-11 09:10:34 -05:00
committed by Ryan Petrello
parent be58906aed
commit e94bb44082
9 changed files with 22 additions and 54 deletions

View File

@@ -1,19 +1,13 @@
---
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
rabbitmq_version: "3.7.4"
rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}"
rabbitmq_default_vhost: "awx"
rabbitmq_erlang_cookie: "cookiemonster"
rabbitmq_hostname: "rabbitmq"
rabbitmq_port: "5672"
rabbitmq_user: "guest"
rabbitmq_password: "guest"
redis_image: "redis"
redis_hostname: "redis"
redis_port: "6379"
postgresql_version: "10"
postgresql_image: "postgres:{{postgresql_version}}"
memcached_image: "memcached"
memcached_version: "alpine"
memcached_hostname: "memcached"

View File

@@ -10,17 +10,13 @@ DATABASES = {
}
}
BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
"{{ rabbitmq_user }}",
"{{ rabbitmq_password }}",
"{{ rabbitmq_hostname | default('rabbitmq')}}",
"{{ rabbitmq_port }}",
"{{ rabbitmq_default_vhost }}")
BROKER_URL = 'redis://{}:{}/'.format(
"{{ redis_hostname }}",
"{{ redis_port }}",)
CHANNEL_LAYERS = {
'default': {'BACKEND': 'asgi_amqp.AMQPChannelLayer',
'ROUTING': 'awx.main.routing.channel_routing',
'CONFIG': {'url': BROKER_URL}}
'default': {'BACKEND': 'awx.main.channels.RedisGroupBroadcastChannelLayer',
'CONFIG': {'hosts': [("{{ redis_hostname }}", {{ redis_port|int }})]}}
}
CACHES = {

View File

@@ -6,7 +6,7 @@ services:
image: {{ awx_web_docker_actual_image }}
container_name: awx_web
depends_on:
- rabbitmq
- redis
- memcached
{% if pg_hostname is not defined %}
- postgres
@@ -63,7 +63,7 @@ services:
image: {{ awx_task_docker_actual_image }}
container_name: awx_task
depends_on:
- rabbitmq
- redis
- memcached
- web
{% if pg_hostname is not defined %}
@@ -111,15 +111,11 @@ services:
https_proxy: {{ https_proxy | default('') }}
no_proxy: {{ no_proxy | default('') }}
rabbitmq:
image: {{ rabbitmq_image }}
container_name: awx_rabbitmq
redis:
image: {{ redis_image }}
container_name: awx_redis
restart: unless-stopped
environment:
RABBITMQ_DEFAULT_VHOST: "{{ rabbitmq_default_vhost }}"
RABBITMQ_DEFAULT_USER: "{{ rabbitmq_user }}"
RABBITMQ_DEFAULT_PASS: "{{ rabbitmq_password | quote }}"
RABBITMQ_ERLANG_COOKIE: {{ rabbitmq_erlang_cookie }}
http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }}
no_proxy: {{ no_proxy | default('') }}

View File

@@ -8,7 +8,7 @@ DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
{% endif %}
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq')|quote }}
RABBITMQ_PORT={{ rabbitmq_port|default('5672')|quote }}
REDIS_HOST={{ redis_hostname|quote }}
REDIS_PORT={{ redis_port|quote }}
AWX_ADMIN_USER={{ admin_user|quote }}
AWX_ADMIN_PASSWORD={{ admin_password|quote }}