External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

redis socket support

Browse Source
This commit is contained in:
chris meyers
2020-03-05 14:19:46 -05:00
committed by Ryan Petrello
parent d58df0f34a
commit 770b457430
26 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/roles/image_build/files/launch_awx.sh
View File

@@ -9,7 +9,6 @@ source /etc/tower/conf.d/environment.sh
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$DATABASE_HOST port=$DATABASE_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$MEMCACHED_HOST port=$MEMCACHED_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$REDIS_HOST port=$REDIS_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m postgresql_db --become-user $DATABASE_USER -a "name=$DATABASE_NAME owner=$DATABASE_USER login_user=$DATABASE_USER login_host=$DATABASE_HOST login_password=$DATABASE_PASSWORD port=$DATABASE_PORT" all
awx-manage collectstatic --noinput --clear

12
installer/roles/image_build/files/settings.py
View File

@@ -85,16 +85,4 @@ DATABASES = {
if os.getenv("DATABASE_SSLMODE", False):
DATABASES['default']['OPTIONS'] = {'sslmode': os.getenv("DATABASE_SSLMODE")}
BROKER_URL = 'redis://{}:{}'.format(
os.getenv("REDIS_HOST", None),
os.getenv("REDIS_PORT", "6379"),)
CHANNEL_LAYERS = {
'default': {'BACKEND': 'channels_redis.core.RedisChannelLayer',
'CONFIG': {
'hosts': [(os.getenv("REDIS_HOST", None), int(os.getenv("REDIS_PORT", 6379)))]
'capacity': 10000,
}}
}
USE_X_FORWARDED_PORT = True

1
installer/roles/image_build/templates/launch_awx_task.sh.j2
View File

@@ -9,7 +9,6 @@ source /etc/tower/conf.d/environment.sh
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$DATABASE_HOST port=$DATABASE_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$MEMCACHED_HOST port=$MEMCACHED_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$REDIS_HOST port=$REDIS_PORT" all
ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m postgresql_db --become-user $DATABASE_USER -a "name=$DATABASE_NAME owner=$DATABASE_USER login_user=$DATABASE_USER login_host=$DATABASE_HOST login_password=$DATABASE_PASSWORD port=$DATABASE_PORT" all
if [ -z "$AWX_SKIP_MIGRATIONS" ]; then

3
installer/roles/kubernetes/defaults/main.yml
View File

@@ -25,8 +25,7 @@ redis_cpu_request: 500
kubernetes_redis_image: "redis"
kubernetes_redis_image_tag: "latest"
kubernetes_redis_hostname: "localhost"
kubernetes_redis_port: "6379"
kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
memcached_hostname: localhost
memcached_mem_request: 1

10
installer/roles/kubernetes/templates/configmap.yml.j2
View File

@@ -205,5 +205,11 @@ data:
USE_X_FORWARDED_PORT = True
AWX_CONTAINER_GROUP_DEFAULT_IMAGE = "{{ container_groups_image }}"
BROADCAST_WEBSOCKETS_PORT = 8052
BROADCAST_WEBSOCKETS_PROTOCOL = 'http'
BROADCAST_WEBSOCKET_PORT = 8052
BROADCAST_WEBSOCKET_PROTOCOL = 'http'
{{ kubernetes_deployment_name }}_redis_conf: |
unixsocket /var/run/redis/redis.sock
unixsocketperm 777
port 0
bind 127.0.0.1

12
installer/roles/kubernetes/templates/credentials.py.j2
View File

@@ -12,15 +12,3 @@ DATABASES = {
},
}
}
BROKER_URL = 'redis://{}:{}/'.format(
"{{ kubernetes_redis_hostname }}",
"{{ kubernetes_redis_port }}",)
CHANNEL_LAYERS = {
'default': {'BACKEND': 'channels_redis.core.RedisChannelLayer',
'CONFIG': {
'hosts': [("{{ kubernetes_redis_hostname }}", {{ kubernetes_redis_port|int }})],
'capacity': 10000,
}}
}

26
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -40,6 +40,7 @@ spec:
service: django
app: {{ kubernetes_deployment_name }}
spec:
serviceAccountName: awx
terminationGracePeriodSeconds: 10
{% if custom_venvs is defined %}
{% set trusted_hosts = "" %}
@@ -127,6 +128,9 @@ spec:
subPath: SECRET_KEY
readOnly: true
- name: {{ kubernetes_deployment_name }}-redis-socket
mountPath: "/var/run/redis"
resources:
requests:
memory: "{{ web_mem_request }}Gi"
@@ -170,6 +174,9 @@ spec:
mountPath: "/etc/tower/SECRET_KEY"
subPath: SECRET_KEY
readOnly: true
- name: {{ kubernetes_deployment_name }}-redis-socket
mountPath: "/var/run/redis"
env:
- name: AWX_SKIP_MIGRATIONS
value: "1"
@@ -197,10 +204,19 @@ spec:
- name: {{ kubernetes_deployment_name }}-redis
image: {{ kubernetes_redis_image }}:{{ kubernetes_redis_image_tag }}
imagePullPolicy: Always
args: ["/usr/local/etc/redis/redis.conf"]
ports:
- name: redis
protocol: TCP
containerPort: 6379
volumeMounts:
- name: {{ kubernetes_deployment_name }}-redis-config
mountPath: "{{ kubernetes_redis_config_mount_path }}"
subPath: redis.conf
readOnly: true
- name: {{ kubernetes_deployment_name }}-redis-socket
mountPath: "/var/run/redis"
resources:
requests:
memory: "{{ redis_mem_request }}Gi"
@@ -273,6 +289,13 @@ spec:
- key: {{ kubernetes_deployment_name }}_nginx_conf
path: nginx.conf
- name: {{ kubernetes_deployment_name }}-redis-config
configMap:
name: {{ kubernetes_deployment_name }}-config
items:
- key: {{ kubernetes_deployment_name }}_redis_conf
path: redis.conf
- name: "{{ kubernetes_deployment_name }}-application-credentials"
secret:
secretName: "{{ kubernetes_deployment_name }}-secrets"
@@ -289,6 +312,9 @@ spec:
- key: secret_key
path: SECRET_KEY
- name: {{ kubernetes_deployment_name }}-redis-socket
emptyDir: {}
---
apiVersion: v1
kind: Service

2
installer/roles/local_docker/defaults/main.yml
View File

@@ -2,8 +2,6 @@
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
redis_image: "redis"
redis_hostname: "redis"
redis_port: "6379"
postgresql_version: "10"
postgresql_image: "postgres:{{postgresql_version}}"

12
installer/roles/local_docker/tasks/compose.yml
View File

@@ -4,6 +4,12 @@
path: "{{ docker_compose_dir }}"
state: directory
- name: Create Redis socket directory
file:
path: "{{ docker_compose_dir }}/redis_socket"
state: directory
mode: 0777
- name: Create Docker Compose Configuration
template:
src: "{{ item }}.j2"
@@ -14,8 +20,14 @@
- credentials.py
- docker-compose.yml
- nginx.conf
- redis.conf
register: awx_compose_config
- name: Set redis config to other group readable to satisfy redis-server
file:
path: "{{ docker_compose_dir }}/redis.conf"
mode: 0666
- name: Render SECRET_KEY file
copy:
content: "{{ secret_key }}"

12
installer/roles/local_docker/templates/credentials.py.j2
View File

@@ -10,18 +10,6 @@ DATABASES = {
}
}
BROKER_URL = 'redis://{}:{}/'.format(
"{{ redis_hostname }}",
"{{ redis_port }}",)
CHANNEL_LAYERS = {
'default': {'BACKEND': 'channels_redis.core.RedisChannelLayer',
'CONFIG': {
'hosts': [("{{ redis_hostname }}", {{ redis_port|int }})],
'capacity': 10000,
}}
}
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',

6
installer/roles/local_docker/templates/docker-compose.yml.j2
View File

@@ -24,6 +24,7 @@ services:
- "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
- "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro"
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
{% if project_data_dir is defined %}
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
{% endif %}
@@ -76,6 +77,7 @@ services:
- "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
- "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
{% if project_data_dir is defined %}
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
{% endif %}
@@ -119,6 +121,10 @@ services:
http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }}
no_proxy: {{ no_proxy | default('') }}
command: ["/usr/local/etc/redis/redis.conf"]
volumes:
- "{{ docker_compose_dir }}/redis.conf:/usr/local/etc/redis/redis.conf:ro"
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
memcached:
image: "{{ memcached_image }}:{{ memcached_version }}"

2
installer/roles/local_docker/templates/environment.sh.j2
View File

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

4
installer/roles/local_docker/templates/redis.conf.j2 Normal file
View File

@@ -0,0 +1,4 @@
unixsocket /var/run/redis/redis.sock
unixsocketperm 777
port 0
bind 127.0.0.1