epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support python 3.12 for terraform.py in regex expression (#11773)

Browse Source
This commit is contained in:
Enrico Falco
2024-12-09 16:50:02 +01:00
committed by GitHub
parent fccd143533
commit 782c0b35eb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/terraform/terraform.py
View File

@@ -98,7 +98,7 @@ PARSERS = {}
def _clean_dc(dcname): def _clean_dc(dcname):
# Consul DCs are strictly alphanumeric with underscores and hyphens - # Consul DCs are strictly alphanumeric with underscores and hyphens -
# ensure that the consul_dc attribute meets these requirements. # ensure that the consul_dc attribute meets these requirements.
return re.sub('[^\w_\-]', '-', dcname) return re.sub(r'[^\w_\-]', '-', dcname)
def iterhosts(resources): def iterhosts(resources):
@@ -304,7 +304,7 @@ def openstack_host(resource, module_name):
try: try:
if 'metadata.prefer_ipv6' in raw_attrs and raw_attrs['metadata.prefer_ipv6'] == "1": if 'metadata.prefer_ipv6' in raw_attrs and raw_attrs['metadata.prefer_ipv6'] == "1":
attrs.update({ attrs.update({
'ansible_host': re.sub("[\[\]]", "", raw_attrs['access_ip_v6']), 'ansible_host': re.sub(r"[\[\]]", "", raw_attrs['access_ip_v6']),
'publicly_routable': True, 'publicly_routable': True,
}) })
else: else: