Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Apparently we don't need to repeat volume definitions across deploymentconfigs

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2022-11-18 12:21:48 +01:00
parent 53b48df54f
commit 2571561222
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
1 changed files with 2 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

46
roles/openshift-apps/fmn/templates/deploymentconfig.yml
View file

@ -171,28 +171,7 @@ spec:
env:
- name: APP_SCRIPT
value: ".s2i/run-consumer.sh"
volumes:
- name: etc-fmn
configMap:
name: fmn-config
- name: rabbitmq-ca-volume
mountPath: /etc/pki/rabbitmq/ca
readOnly: true
- name: rabbitmq-key-volume
mountPath: /etc/pki/rabbitmq/key
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly:
- name: rabbitmq-ca-volume
secret:
secretName: rabbitmq-ca
- name: rabbitmq-key-volume
secret:
secretName: rabbitmq-key
- name: rabbitmq-crt-volume
secret:
secretName: rabbitmq-cert
# No need to list the volumes again
triggers:
- type: ImageChange
imageChangeParams:
@ -244,28 +223,7 @@ spec:
env:
- name: APP_SCRIPT
value: ".s2i/run-sender-email.sh"
volumes:
- name: etc-fmn
configMap:
name: fmn-config
- name: rabbitmq-ca-volume
mountPath: /etc/pki/rabbitmq/ca
readOnly: true
- name: rabbitmq-key-volume
mountPath: /etc/pki/rabbitmq/key
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly:
- name: rabbitmq-ca-volume
secret:
secretName: rabbitmq-ca
- name: rabbitmq-key-volume
secret:
secretName: rabbitmq-key
- name: rabbitmq-crt-volume
secret:
secretName: rabbitmq-cert
# No need to list the volumes again
triggers:
- type: ImageChange
imageChangeParams: