Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Catch when a comma is left out of puppet_classes. 

With two space-separated classes in `puppet_classes`, the second one
is silently ignored.  With three of more, puppet generates the
following very opaque error message:

```
Error: Could not parse for environment production: This
Name has no effect. A value was produced and then forgotten (one or
more preceding expressions may have the wrong form)
```

Catch when this has happened, and give an error message to the user.

Fixes #18992.
This commit is contained in:
Alex Vandiver 2021-06-28 15:06:46 -07:00 committed by Alex Vandiver
parent e311a0ad31
commit 88c19bf65a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/zulip-puppet-apply
View File

@ -34,6 +34,11 @@ Exec { path => "/usr/sbin:/usr/bin:/sbin:/bin" }
""" """
for pclass in re.split(r"\s*,\s*", config.get("machine", "puppet_classes")): for pclass in re.split(r"\s*,\s*", config.get("machine", "puppet_classes")):
if " " in pclass:
print(
f"The `machine.puppet_classes` setting in {args.config} must be comma-separated, not space-separated!"
)
sys.exit(1)
puppet_config += f"include {pclass}\n" puppet_config += f"include {pclass}\n"
# We use the Puppet configuration from the same Zulip checkout as this script # We use the Puppet configuration from the same Zulip checkout as this script