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

Make HTTPConnection import python 2,3 agnostic

Browse Source
This commit is contained in:
Wander Boessenkool
2019-10-17 23:36:33 +02:00
parent 00c9d756e8
commit c49e64e62c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,12 +273,15 @@ spec:
- /usr/bin/python - /usr/bin/python
- -c - -c
- | - |
import httplib try:
from http.client import HTTPConnection
except ImportError:
from httplib import HTTPConnection
import sys import sys
import os import os
import base64 import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD')) authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=httplib.HTTPConnection('localhost:15672') conn=HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret}) 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:
@@ -297,12 +300,15 @@ spec:
- /usr/bin/python - /usr/bin/python
- -c - -c
- | - |
import httplib try:
from http.client import HTTPConnection
except ImportError:
from httplib import HTTPConnection
import sys import sys
import os import os
import base64 import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD')) authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=httplib.HTTPConnection('localhost:15672') conn=HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret}) 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: