diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index a37630870dfa8d7228a8f75ae36d0d87aa303a55..26a7418a54c4565b5bfb55bb82672de369f05b3a 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -740,7 +740,7 @@ class SeedContainerImageBuild(KayobeAnsibleMixin, VaultMixin, Command): "container-image-build") extra_vars = {"push_images": parsed_args.push} if parsed_args.regex: - regexes = "'%s'" % " ".join(parsed_args.regex) + regexes = " ".join(parsed_args.regex) extra_vars["container_image_regexes"] = regexes else: extra_vars["container_image_sets"] = ( @@ -1422,7 +1422,7 @@ class OvercloudContainerImageBuild(KayobeAnsibleMixin, VaultMixin, Command): "container-image-build") extra_vars = {"push_images": parsed_args.push} if parsed_args.regex: - regexes = "'%s'" % " ".join(parsed_args.regex) + regexes = " ".join(parsed_args.regex) extra_vars["container_image_regexes"] = regexes else: extra_vars["container_image_sets"] = ( diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index 612282d80dd60fffb1ca342a91c07ad073816226..9d38ea6a0d46f70cb4500f025ede7594219dbbe0 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -829,7 +829,7 @@ class TestCase(unittest.TestCase): "ansible", "container-image-build.yml") ], extra_vars={ - "container_image_regexes": "'^regex1$ ^regex2$'", + "container_image_regexes": "^regex1$ ^regex2$", "push_images": True, } ), @@ -1781,7 +1781,7 @@ class TestCase(unittest.TestCase): "ansible", "container-image-build.yml") ], extra_vars={ - "container_image_regexes": "'^regex1$ ^regex2$'", + "container_image_regexes": "^regex1$ ^regex2$", "push_images": True, } ), diff --git a/releasenotes/notes/fix-image-build-regex-964c8c6359841662.yaml b/releasenotes/notes/fix-image-build-regex-964c8c6359841662.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b8d26b81ed4d42fc59823ad84ea2ebab57085173 --- /dev/null +++ b/releasenotes/notes/fix-image-build-regex-964c8c6359841662.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes an issue when specifying multiple regular expressions to the ``kayobe + seed container image build`` and ``kayobe overcloud container image build`` + commands. See `story 2006475 + <https://storyboard.openstack.org/#!/story/2006475>`__ for details.