forked from infra/ansible
bodhi-stg: cannot use --include to override valkey conf
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
This commit is contained in:
parent
481443b92f
commit
b5eddd80ea
3 changed files with 1 additions and 27 deletions
|
|
@ -83,11 +83,6 @@
|
|||
object_template: secret.yml.j2
|
||||
object_objectname: secret.yml
|
||||
when: env == "staging"
|
||||
- role: openshift/object
|
||||
object_app: bodhi
|
||||
object_template: valkey-configmap.yml.j2
|
||||
object_objectname: valkey-configmap.yml
|
||||
when: env == "staging"
|
||||
- role: openshift/keytab
|
||||
keytab_app: bodhi
|
||||
keytab_key: koji-keytab
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ spec:
|
|||
- name: bodhi-valkey
|
||||
image: image-registry.openshift-image-registry.svc:5000/bodhi/bodhi-valkey:latest
|
||||
command: ["valkey-server"]
|
||||
args: ["/etc/valkey/valkey.conf", "--include", "/etc/valkey/valkey-overrides.conf", "--requirepass", "$(VALKEY_PASSWORD)"]
|
||||
args: ["/etc/valkey/valkey.conf", "--bind", "0.0.0.0", "--pidfile", "", "--dir", "/data", "--loglevel", "{{ 'verbose' if env == 'staging' else 'warning' }}", "--requirepass", "$(VALKEY_PASSWORD)"]
|
||||
env:
|
||||
- name: VALKEY_PASSWORD
|
||||
valueFrom:
|
||||
|
|
@ -397,9 +397,6 @@ spec:
|
|||
volumeMounts:
|
||||
- name: bodhi-valkey-data-volume
|
||||
mountPath: /data
|
||||
- name: bodhi-valkey-config-volume
|
||||
mountPath: /etc/valkey/valkey-overrides.conf
|
||||
subPath: valkey-overrides.conf
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
protocol: TCP
|
||||
|
|
@ -420,9 +417,6 @@ spec:
|
|||
- name: bodhi-valkey-data-volume
|
||||
persistentVolumeClaim:
|
||||
claimName: "bodhi-valkey-storage{{ '-stg' if env == 'staging' else '' }}"
|
||||
- name: bodhi-valkey-config-volume
|
||||
configMap:
|
||||
name: bodhi-valkey-config
|
||||
---
|
||||
# bodhi-valkey Service
|
||||
apiVersion: v1
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
{% if env == "staging" %}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: bodhi-valkey-config
|
||||
labels:
|
||||
app: bodhi-valkey
|
||||
data:
|
||||
valkey-overrides.conf: |
|
||||
bind 0.0.0.0
|
||||
logfile ""
|
||||
loglevel {{ 'verbose' if env == 'staging' else 'notice' }}
|
||||
pidfile ""
|
||||
dir /data
|
||||
{% endif %}
|
||||
Loading…
Add table
Add a link
Reference in a new issue