openstack/openstack-ansible
Code Issues Proposed changes

Merge "Treat dashes/underscores as interchangeable symbols for container names"

Browse Source
This commit is contained in:
Zuul 2024-02-28 00:04:49 +00:00 committed by Gerrit Code Review
commit 022c9c4c22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osa_toolkit/generate.py
View File

@ -22,6 +22,7 @@ import netaddr
from osa_toolkit import dictutils as du from osa_toolkit import dictutils as du
from osa_toolkit import filesystem as filesys from osa_toolkit import filesystem as filesys
from osa_toolkit import ip from osa_toolkit import ip
import re
import uuid import uuid
import warnings import warnings
@ -171,7 +172,8 @@ def _build_container_hosts(container_affinity, container_hosts, type_and_name,
for make_container in range(container_affinity): for make_container in range(container_affinity):
for i in container_hosts: for i in container_hosts:
if '{}-'.format(type_and_name) in i: sub_item = re.sub(r'[_-]', '[_-]', f'{type_and_name}-')
if re.match(sub_item, i):
du.append_if(array=container_list, item=i) du.append_if(array=container_list, item=i)
existing_count = len(list(set(container_list))) existing_count = len(list(set(container_list)))