Vagrantfile: Avoid extra blocks & shadowing `config` variable
ClosedPublic
Actions

Authored by ardumont on Sep 29 2020, 6:05 PM.

Details

Reviewers

olasd

Group Reviewers

Reviewers

Commits

rSENV11693274f0ef: Vagrantfile: Avoid extra blocks & shadowing `config` variable

Summary

This effectively drops the many Vagrant.configure blocks and keep only the
main one. Then, it renames the main "config" variable into "cfg" and keep the
local variable "config" for each remaining local vm declaration.

Test Plan

vagrant destroy test; vagrant up test is fine

Diff Detail

Repository

rSENV Puppet Environment

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Sep 29 2020, 6:05 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptSep 29 2020, 6:05 PM

Harbormaster completed remote builds in B15701: Diff 14408.Sep 29 2020, 6:05 PM

Rather than cfg, please call the new variable vagrant_config or global_config or anything clearer. I'd rather have a shadowed single variable name than two variable names that can be confused :)

(I'm not sure what's the point of merging the Vagrant.configure blocks but it's not like it hurts anything)

This revision is now accepted and ready to land.Sep 29 2020, 6:09 PM

ack on the naming, it will be clearer indeed.

There is not much point indeed.
Besides avoiding the clash and decrease a bit the declaration.

Rename to global_config

Harbormaster completed remote builds in B15702: Diff 14409.Sep 29 2020, 6:17 PM

Rebase

Harbormaster completed remote builds in B15705: Diff 14412.Sep 29 2020, 6:28 PM

Closed by commit rSENV11693274f0ef: Vagrantfile: Avoid extra blocks & shadowing `config` variable (authored by ardumont). · Explain WhySep 29 2020, 6:29 PM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rSENV11693274f0ef: Vagrantfile: Avoid extra blocks & shadowing `config` variable.