From c49e64e62cd228894f7fd892b04eb915c1ddaf66 Mon Sep 17 00:00:00 2001 From: Wander Boessenkool Date: Thu, 17 Oct 2019 23:36:33 +0200 Subject: [PATCH] Make HTTPConnection import python 2,3 agnostic --- .../roles/kubernetes/templates/deployment.yml.j2 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 91479bbd51..d71a6ebc54 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -273,12 +273,15 @@ spec: - /usr/bin/python - -c - | - import httplib + try: + from http.client import HTTPConnection + except ImportError: + from httplib import HTTPConnection import sys import os import base64 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}) r1 = conn.getresponse() if r1.status != 200: @@ -297,12 +300,15 @@ spec: - /usr/bin/python - -c - | - import httplib + try: + from http.client import HTTPConnection + except ImportError: + from httplib import HTTPConnection import sys import os import base64 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}) r1 = conn.getresponse() if r1.status != 200: