From 1d6a5fc329d44bdf79b692928eac258271b59702 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Aug 2020 09:55:37 -0400 Subject: [PATCH] Have add_local_repositories by python2/3 agnostic RHEL7 is still python2 --- .../default/scripts/add_local_repositories | 21 +++++++++++++------ .../default/scripts/add_local_repositories | 21 +++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/confluent_osdeploy/el7/profiles/default/scripts/add_local_repositories b/confluent_osdeploy/el7/profiles/default/scripts/add_local_repositories index e0c79d3b..12cecbc1 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/add_local_repositories +++ b/confluent_osdeploy/el7/profiles/default/scripts/add_local_repositories @@ -1,4 +1,8 @@ -import configparser +try: + import configparser +except ImportError: + import ConfigParser as configparser + import cStringIO import imp import sys apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient') @@ -17,18 +21,23 @@ path = '/confluent-public/os/{0}/distribution/'.format(profile) clnt = apiclient.HTTPSClient() cfgdata = clnt.grab_url(path + '.treeinfo').decode() c = configparser.ConfigParser() -c.read_string(cfgdata) +try: + c.read_string(cfgdata) +except AttributeError: + f = cStringIO.StringIO(cfgdata) + c.readfp(f) for sec in c.sections(): if sec.startswith('variant-'): - if 'repository' not in c[sec]: + try: + repopath = c.get(sec, 'repository') + except Exception: continue _, varname = sec.split('-', 1) reponame = '/etc/yum.repos.d/local-{0}.repo'.format(varname.lower()) with open(reponame, 'w') as repout: repout.write('[local-{0}]\n'.format(varname.lower())) repout.write('name=Local install repository for {0}\n'.format(varname)) - repopath = c[sec]['repository'] - if repopath[0] = '.': + if repopath[0] == '.': repopath = repopath[1:] - repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, c[sec]['repository'])) + repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, repopath)) repout.write('enabled=1\n') diff --git a/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories b/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories index e0c79d3b..12cecbc1 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories +++ b/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories @@ -1,4 +1,8 @@ -import configparser +try: + import configparser +except ImportError: + import ConfigParser as configparser + import cStringIO import imp import sys apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient') @@ -17,18 +21,23 @@ path = '/confluent-public/os/{0}/distribution/'.format(profile) clnt = apiclient.HTTPSClient() cfgdata = clnt.grab_url(path + '.treeinfo').decode() c = configparser.ConfigParser() -c.read_string(cfgdata) +try: + c.read_string(cfgdata) +except AttributeError: + f = cStringIO.StringIO(cfgdata) + c.readfp(f) for sec in c.sections(): if sec.startswith('variant-'): - if 'repository' not in c[sec]: + try: + repopath = c.get(sec, 'repository') + except Exception: continue _, varname = sec.split('-', 1) reponame = '/etc/yum.repos.d/local-{0}.repo'.format(varname.lower()) with open(reponame, 'w') as repout: repout.write('[local-{0}]\n'.format(varname.lower())) repout.write('name=Local install repository for {0}\n'.format(varname)) - repopath = c[sec]['repository'] - if repopath[0] = '.': + if repopath[0] == '.': repopath = repopath[1:] - repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, c[sec]['repository'])) + repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, repopath)) repout.write('enabled=1\n')