External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

use memcached unix domain socket rather than tcp

Browse Source
This commit is contained in:
chris meyers
2020-03-31 15:57:50 -04:00
parent 99511de728
commit 37a715c680
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ fi
source /etc/tower/conf.d/environment.sh 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=$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 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 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 awx-manage collectstatic --noinput --clear

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

@@ -8,7 +8,6 @@ fi
source /etc/tower/conf.d/environment.sh 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=$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 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 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 if [ -z "$AWX_SKIP_MIGRATIONS" ]; then

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

@@ -195,7 +195,7 @@ data:
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': '{}:{}'.format("localhost", "11211") 'LOCATION': 'unix:/var/run/memcached/memcached.sock'
}, },
'ephemeral': { 'ephemeral': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',

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

@@ -150,6 +150,9 @@ spec:
- name: {{ kubernetes_deployment_name }}-redis-socket - name: {{ kubernetes_deployment_name }}-redis-socket
mountPath: "/var/run/redis" mountPath: "/var/run/redis"
- name: {{ kubernetes_deployment_name }}-memcached-socket
mountPath: "/var/run/memcached"
resources: resources:
requests: requests:
memory: "{{ web_mem_request }}Gi" memory: "{{ web_mem_request }}Gi"
@@ -216,6 +219,9 @@ spec:
- name: {{ kubernetes_deployment_name }}-redis-socket - name: {{ kubernetes_deployment_name }}-redis-socket
mountPath: "/var/run/redis" mountPath: "/var/run/redis"
- name: {{ kubernetes_deployment_name }}-memcached-socket
mountPath: "/var/run/memcached"
env: env:
- name: AWX_SKIP_MIGRATIONS - name: AWX_SKIP_MIGRATIONS
value: "1" value: "1"
@@ -272,6 +278,15 @@ spec:
- name: {{ kubernetes_deployment_name }}-memcached - name: {{ kubernetes_deployment_name }}-memcached
image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}" image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
imagePullPolicy: Always imagePullPolicy: Always
command:
- 'memcached'
- '-s'
- '/var/run/memcached/memcached.sock'
- '-a'
- '0666'
volumeMounts:
- name: {{ kubernetes_deployment_name }}-memcached-socket
mountPath: "/var/run/memcached"
resources: resources:
requests: requests:
memory: "{{ memcached_mem_request }}Gi" memory: "{{ memcached_mem_request }}Gi"
@@ -385,6 +400,9 @@ spec:
- name: {{ kubernetes_deployment_name }}-redis-socket - name: {{ kubernetes_deployment_name }}-redis-socket
emptyDir: {} emptyDir: {}
- name: {{ kubernetes_deployment_name }}-memcached-socket
emptyDir: {}
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service