From cc0962f5e57619cff1dbb21ff80d95e67ea43db5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 6 Jan 2023 15:35:36 -0500 Subject: [PATCH] Fix add_local_repositories in v6 environment --- .../profiles/default/scripts/add_local_repositories | 13 ++++++++++++- .../profiles/default/scripts/add_local_repositories | 13 ++++++++++++- .../profiles/default/scripts/add_local_repositories | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/add_local_repositories b/confluent_osdeploy/el8-diskless/profiles/default/scripts/add_local_repositories index 2e128b47..796e5c25 100644 --- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/add_local_repositories +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/add_local_repositories @@ -7,15 +7,26 @@ import imp import sys apiclient = imp.load_source('apiclient', '/opt/confluent/bin/apiclient') repo = None +server4 = None server = None +server6 = None profile = None +v4cfg = None with open('/etc/confluent/confluent.deploycfg') as dplcfgfile: lines = dplcfgfile.read().split('\n') for line in lines: if line.startswith('deploy_server:'): - _, server = line.split(' ', 1) + _, server4 = line.split(' ', 1) + if line.startswith('deploy_server_v6:'): + _, server6 = line.split(' ', 1) if line.startswith('profile: '): _, profile = line.split(' ', 1) + if line.startswith('ipv4_method: '): + _, v4cfg = line.split(' ', 1) +if v4cfg == 'static' or v4cfg =='dhcp': + server = server4 +if not server: + server = '[{}]'.format(server6) path = '/confluent-public/os/{0}/distribution/'.format(profile) clnt = apiclient.HTTPSClient() diff --git a/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories b/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories index e9cc5e9a..3e47423a 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories +++ b/confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories @@ -12,14 +12,25 @@ apiclient = importlib.util.module_from_spec(modspec) modspec.loader.exec_module(apiclient) repo = None server = None +v4cfg = None +server4 = None +server6 = None profile = None with open('/etc/confluent/confluent.deploycfg') as dplcfgfile: lines = dplcfgfile.read().split('\n') for line in lines: if line.startswith('deploy_server:'): - _, server = line.split(' ', 1) + _, server4 = line.split(' ', 1) + if line.startswith('deploy_server_v6:'): + _, server6 = line.split(' ', 1) if line.startswith('profile: '): _, profile = line.split(' ', 1) + if line.startswith('ipv4_method: '): + _, v4cfg = line.split(' ', 1) +if v4cfg == 'static' or v4cfg =='dhcp': + server = server4 +if not server: + server = '[{}]'.format(server6) path = '/confluent-public/os/{0}/distribution/'.format(profile) clnt = apiclient.HTTPSClient() diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/add_local_repositories b/confluent_osdeploy/el9-diskless/profiles/default/scripts/add_local_repositories index e9cc5e9a..3e47423a 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/add_local_repositories +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/add_local_repositories @@ -12,14 +12,25 @@ apiclient = importlib.util.module_from_spec(modspec) modspec.loader.exec_module(apiclient) repo = None server = None +v4cfg = None +server4 = None +server6 = None profile = None with open('/etc/confluent/confluent.deploycfg') as dplcfgfile: lines = dplcfgfile.read().split('\n') for line in lines: if line.startswith('deploy_server:'): - _, server = line.split(' ', 1) + _, server4 = line.split(' ', 1) + if line.startswith('deploy_server_v6:'): + _, server6 = line.split(' ', 1) if line.startswith('profile: '): _, profile = line.split(' ', 1) + if line.startswith('ipv4_method: '): + _, v4cfg = line.split(' ', 1) +if v4cfg == 'static' or v4cfg =='dhcp': + server = server4 +if not server: + server = '[{}]'.format(server6) path = '/confluent-public/os/{0}/distribution/'.format(profile) clnt = apiclient.HTTPSClient()