Merge pull request #5690 from sivel/rax-regex-fix

rax module: Fix regex match
11 years ago · d74a184bad
parent b86df363a1 ccbed7bb55
commit d74a184bad
1 changed files with 2 additions and 2 deletions
--- a/cloud/rax
+++ b/cloud/rax
@ -464,7 +464,7 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
                        else:
                            module.fail_json(msg=e.message)

-                    pattern = re.sub(r'%\d+[sd]', r'(\d+)', name)
+                    pattern = re.sub(r'%\d*[sd]', r'(\d+)', name)
                    for server in cs.servers.list():
                        if server.metadata.get('group') == group:
                            servers.append(server)
@ -525,7 +525,7 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
                        else:
                            module.fail_json(msg=e.message)

-                    pattern = re.sub(r'%\d+[sd]', r'(\d+)', name)
+                    pattern = re.sub(r'%\d*[sd]', r'(\d+)', name)
                    for server in cs.servers.list():
                        if server.metadata.get('group') == group:
                            servers.append(server)