iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reformat via gofmt

This commit is contained in:
Matthew Patton 2018-05-08 12:44:15 -04:00
parent f510a8667b
commit d22fb6d60b
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
provisioner/puppet-masterless/provisioner.go
View File

@ -122,17 +122,17 @@ type Provisioner struct {
} }
type ExecuteTemplate struct { type ExecuteTemplate struct {
Debug bool Debug bool
ExtraArguments string ExtraArguments string
FacterVars string FacterVars string
HieraConfigPath string HieraConfigPath string
ModulePath string ModulePath string
ModulePathJoiner string ModulePathJoiner string
ManifestFile string ManifestFile string
ManifestDir string ManifestDir string
PuppetBinDir string PuppetBinDir string
Sudo bool Sudo bool
WorkingDir string WorkingDir string
} }
func (p *Provisioner) Prepare(raws ...interface{}) error { func (p *Provisioner) Prepare(raws ...interface{}) error {
@ -292,16 +292,16 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
} }
data := ExecuteTemplate{ data := ExecuteTemplate{
ExtraArguments: "", ExtraArguments: "",
FacterVars: strings.Join(facterVars, p.guestOSTypeConfig.facterVarsJoiner), FacterVars: strings.Join(facterVars, p.guestOSTypeConfig.facterVarsJoiner),
HieraConfigPath: remoteHieraConfigPath, HieraConfigPath: remoteHieraConfigPath,
ManifestDir: remoteManifestDir, ManifestDir: remoteManifestDir,
ManifestFile: remoteManifestFile, ManifestFile: remoteManifestFile,
ModulePath: strings.Join(modulePaths, p.guestOSTypeConfig.modulePathJoiner), ModulePath: strings.Join(modulePaths, p.guestOSTypeConfig.modulePathJoiner),
ModulePathJoiner: p.guestOSTypeConfig.modulePathJoiner, ModulePathJoiner: p.guestOSTypeConfig.modulePathJoiner,
PuppetBinDir: p.config.PuppetBinDir, PuppetBinDir: p.config.PuppetBinDir,
Sudo: !p.config.PreventSudo, Sudo: !p.config.PreventSudo,
WorkingDir: p.config.WorkingDir, WorkingDir: p.config.WorkingDir,
} }
p.config.ctx.Data = &data p.config.ctx.Data = &data