openstack/kayobe
Code Issues Proposed changes

Quote container image build regexes

Browse Source 
Without quotes ansible takes only the first word of a space-separated variable.
This commit is contained in:
Mark Goddard 2017-07-11 18:40:57 +01:00
parent 775f80ded5
commit 158adefbb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kayobe/cli/commands.py
View File

@ -299,7 +299,7 @@ class SeedContainerImageBuild(KayobeAnsibleMixin, VaultMixin, Command):
"kolla-build", "container-image-build") "kolla-build", "container-image-build")
extra_vars = {"push_images": parsed_args.push} extra_vars = {"push_images": parsed_args.push}
if parsed_args.regex: if parsed_args.regex:
regexes = " ".join(parsed_args.regex) regexes = "'%s'" % " ".join(parsed_args.regex)
extra_vars["container_image_regexes"] = regexes extra_vars["container_image_regexes"] = regexes
self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed", self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed",
extra_vars=extra_vars) extra_vars=extra_vars)
@ -563,7 +563,7 @@ class OvercloudContainerImageBuild(KayobeAnsibleMixin, VaultMixin, Command):
"kolla-build", "container-image-build") "kolla-build", "container-image-build")
extra_vars = {"push_images": parsed_args.push} extra_vars = {"push_images": parsed_args.push}
if parsed_args.regex: if parsed_args.regex:
regexes = " ".join(parsed_args.regex) regexes = "'%s'" % " ".join(parsed_args.regex)
extra_vars["container_image_regexes"] = regexes extra_vars["container_image_regexes"] = regexes
self.run_kayobe_playbooks(parsed_args, playbooks, limit="controllers", self.run_kayobe_playbooks(parsed_args, playbooks, limit="controllers",
extra_vars=extra_vars) extra_vars=extra_vars)