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

Move installtime hardcoded rabbitmq credentials to environment variables for healthcheck

Browse Source
This commit is contained in:
Wander Boessenkool
2019-10-17 23:23:29 +02:00
parent 9ab58e9757
commit 00c9d756e8
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,8 +275,11 @@ spec:
- | - |
import httplib import httplib
import sys import sys
import os
import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=httplib.HTTPConnection('localhost:15672') conn=httplib.HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic {{ ( rabbitmq_user + ':' + rabbitmq_password ) | b64encode }}' }) conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret})
r1 = conn.getresponse() r1 = conn.getresponse()
if r1.status != 200: if r1.status != 200:
sys.stderr.write('Received http error %i\n' % (r1.status)) sys.stderr.write('Received http error %i\n' % (r1.status))
@@ -296,8 +299,11 @@ spec:
- | - |
import httplib import httplib
import sys import sys
import os
import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=httplib.HTTPConnection('localhost:15672') conn=httplib.HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic {{ ( rabbitmq_user + ':' + rabbitmq_password ) | b64encode }}' }) conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret})
r1 = conn.getresponse() r1 = conn.getresponse()
if r1.status != 200: if r1.status != 200:
sys.stderr.write('Received http error %i\n' % (r1.status)) sys.stderr.write('Received http error %i\n' % (r1.status))
@@ -325,6 +331,13 @@ spec:
key: rabbitmq_erlang_cookie key: rabbitmq_erlang_cookie
- name: K8S_SERVICE_NAME - name: K8S_SERVICE_NAME
value: "rabbitmq" value: "rabbitmq"
- name: RABBITMQ_USER
value: {{ rabbitmq_user }}
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ kubernetes_deployment_name }}-secrets"
key: rabbitmq_password
volumeMounts: volumeMounts:
- name: rabbitmq-config - name: rabbitmq-config
mountPath: /etc/rabbitmq mountPath: /etc/rabbitmq