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

run gofmt for alignment and whitespace management

This commit is contained in:
Matthew Patton 2018-04-27 22:51:48 -04:00
parent d57842e06d
commit 2450e57fbe
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ type Config struct {
type guestOSTypeConfig struct {
tempDir string
stagingDir string
executeCommand string
executeCommand string
facterVarsFmt string
facterVarsJoiner string
modulePathJoiner string
@ -82,7 +82,7 @@ type guestOSTypeConfig struct {
// FIXME assumes both Packer host and target are same OS
var guestOSTypeConfigs = map[string]guestOSTypeConfig{
provisioner.UnixOSType: {
tempDir: "/tmp",
tempDir: "/tmp",
stagingDir: "/tmp/packer-puppet-masterless",
executeCommand: "cd {{.WorkingDir}} && " +
`{{if ne .FacterVars ""}}{{.FacterVars}} {{end}}` +
@ -100,7 +100,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
modulePathJoiner: ":",
},
provisioner.WindowsOSType: {
tempDir: path.filepath.ToSlash(os.Getenv("TEMP")),
tempDir: path.filepath.ToSlash(os.Getenv("TEMP")),
stagingDir: path.filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-masterless",
executeCommand: "cd {{.WorkingDir}} && " +
`{{if ne .FacterVars ""}}{{.FacterVars}} && {{end}}` +
@ -125,23 +125,23 @@ type Provisioner struct {
}
type ExecuteTemplate struct {
FacterVars string
FacterVars string
HieraConfigPath string
ModulePath string
ManifestFile string
ManifestDir string
PuppetBinDir string
Sudo bool
WorkingDir string
Debug bool
ExtraArguments string
ModulePath string
ManifestFile string
ManifestDir string
PuppetBinDir string
Sudo bool
WorkingDir string
Debug bool
ExtraArguments string
}
func (p *Provisioner) Prepare(raws ...interface{}) error {
err := config.Decode(&p.config, &config.DecodeOpts{
Interpolate: true,
InterpolateContext: &p.config.ctx,
InterpolateFilter: &interpolate.RenderFilter{
InterpolateFilter: &interpolate.RenderFilter{
Exclude: []string{
"execute_command",
"extra_arguments",

8
provisioner/puppet-server/provisioner.go
View File

@ -72,7 +72,7 @@ type guestOSTypeConfig struct {
// FIXME assumes both Packer host and target are same OS
var guestOSTypeConfigs = map[string]guestOSTypeConfig{
provisioner.UnixOSType: {
tempDir: "/tmp",
tempDir: "/tmp",
stagingDir: "/tmp/packer-puppet-server",
executeCommand: "cd {{.WorkingDir}} && " +
`{{if ne .FacterVars ""}}{{.FacterVars}} {{end}}` +
@ -89,7 +89,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
facterVarsJoiner: " ",
},
provisioner.WindowsOSType: {
tempDir: path.filepath.ToSlash(os.Getenv("TEMP")),
tempDir: path.filepath.ToSlash(os.Getenv("TEMP")),
stagingDir: path.filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-server",
executeCommand: "cd {{.WorkingDir}} && " +
`{{if ne .FacterVars ""}}{{.FacterVars}} && {{end}}` +
@ -116,7 +116,7 @@ type ExecuteTemplate struct {
FacterVars string
ClientCertPath string
ClientPrivateKeyPath string
PuppetNode string
PuppetNode string
PuppetServer string
PuppetBinDir string
Sudo bool
@ -129,7 +129,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
err := config.Decode(&p.config, &config.DecodeOpts{
Interpolate: true,
InterpolateContext: &p.config.ctx,
InterpolateFilter: &interpolate.RenderFilter{
InterpolateFilter: &interpolate.RenderFilter{
Exclude: []string{
"execute_command",
"extra_arguments",