From: Frank Brehm Date: Fri, 13 Oct 2023 15:26:22 +0000 (+0200) Subject: Version bump to 1.7.2 X-Git-Tag: 1.8.0^2~40 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=fe0def53cf43f6e1fc31a7ee9ed9ce9f4ab61016;p=pixelpark%2Fcreate-terraform.git Version bump to 1.7.2 --- diff --git a/lib/cr_tf/__init__.py b/lib/cr_tf/__init__.py index fe55e71..cdac2ba 100644 --- a/lib/cr_tf/__init__.py +++ b/lib/cr_tf/__init__.py @@ -1,7 +1,7 @@ #!/bin/env python3 # -*- coding: utf-8 -*- -__version__ = '1.7.1' +__version__ = '1.7.2' MIN_VERSION_TERRAFORM = '1.0.5' MAX_VERSION_TERRAFORM = '1.8.0' diff --git a/lib/cr_tf/terraform/vm.py b/lib/cr_tf/terraform/vm.py index 86362d4..51dadbf 100644 --- a/lib/cr_tf/terraform/vm.py +++ b/lib/cr_tf/terraform/vm.py @@ -133,7 +133,7 @@ class TerraformVm(HandlingObject): re_key_has_puppet = re.compile(r'^\s*has[_-]?puppet\s*$', re.IGNORECASE) re_key_is_rhel = re.compile(r'^\s*is[_-]?rhel\s*$', re.IGNORECASE) re_memory_value = re.compile(r'^\s*(\d+(?:\.\d*)?)\s*(?:(\D+)\s*)?$') - re_rhel_template = re.compile(r'(?:rhel|red[_-\s]*hat[_-\s]*enterprise)', re.IGNORECASE) + re_rhel_template = re.compile(r'(?:rhel|red[\s_-]*hat[\s_-]*enterprise)', re.IGNORECASE) re_invalid_chars = re.compile(r'[^a-z0-9@\._-]', re.IGNORECASE) re_invalid_chars_role = re.compile(r'[^a-z0-9:@\._-]', re.IGNORECASE)