Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
Issue #42: Make sure redis is listening on TCP port.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed May 26, 2020
1 parent e4510ff commit aeecc94
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 25 deletions.
2 changes: 1 addition & 1 deletion roles/tower/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
with_items:
- tower_memcached.yaml.j2
- tower_postgres.yaml.j2
- tower_redis.yaml.j2
- tower_config.yaml.j2
- tower_redis.yaml.j2
- tower_web.yaml.j2
- tower_task.yaml.j2

Expand Down
6 changes: 0 additions & 6 deletions roles/tower/templates/tower_config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@ data:

USE_X_FORWARDED_PORT = True

redis_conf: |
unixsocket /var/run/redis/redis.sock
unixsocketperm 777
port 0
bind 127.0.0.1

nginx_conf: |
worker_processes 1;
pid /tmp/nginx.pid;
Expand Down
18 changes: 0 additions & 18 deletions roles/tower/templates/tower_redis.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,12 @@ spec:
containers:
- image: '{{ tower_redis_image }}'
name: redis
args: ["/usr/local/etc/redis/redis.conf"]
ports:
- containerPort: 6379
volumeMounts:
- name: redis-config
mountPath: /usr/local/etc/redis/redis.conf
subPath: redis.conf
readOnly: true
- name: redis-socket
mountPath: "/var/run/redis"
resources:
requests:
memory: "{{ tower_redis_mem_request }}"
cpu: "{{ tower_redis_cpu_request }}"
volumes:
- name: redis-config
configMap:
name: "{{ meta.name }}-tower-configmap"
items:
- key: redis_conf
path: redis.conf
- name: redis-socket
emtpyDir: {}

# Redis Service.
---
Expand All @@ -54,7 +37,6 @@ metadata:
labels:
app: tower-redis
spec:
clusterIP: None
ports:
- port: 6379
protocol: TCP
Expand Down

0 comments on commit aeecc94

Please sign in to comment.