From 715662f60b2ae8f251766c92f7d607539cdfb650 Mon Sep 17 00:00:00 2001
From: Chris Bednarski <banzaimonkey@gmail.com>
Date: Mon, 27 Jul 2015 16:42:06 -0700
Subject: [PATCH] Reformat
---
builder/docker/communicator.go | 4 ++--
builder/docker/step_connect_docker.go | 2 +-
builder/openstack/builder.go | 8 ++++----
builder/openstack/run_config.go | 4 ++--
builder/openstack/step_key_pair.go | 10 +++++-----
provisioner/chef-client/provisioner.go | 8 ++++----
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/builder/docker/communicator.go b/builder/docker/communicator.go
index 63ef4cd5b..4fcd9b658 100644
--- a/builder/docker/communicator.go
+++ b/builder/docker/communicator.go
@@ -24,8 +24,8 @@ type Communicator struct {
HostDir string
ContainerDir string
Version *version.Version
- Config *Config
- lock sync.Mutex
+ Config *Config
+ lock sync.Mutex
}
func (c *Communicator) Start(remote *packer.RemoteCmd) error {
diff --git a/builder/docker/step_connect_docker.go b/builder/docker/step_connect_docker.go
index 315cfc204..f84d369c2 100644
--- a/builder/docker/step_connect_docker.go
+++ b/builder/docker/step_connect_docker.go
@@ -26,7 +26,7 @@ func (s *StepConnectDocker) Run(state multistep.StateBag) multistep.StepAction {
HostDir: tempDir,
ContainerDir: "/packer-files",
Version: version,
- Config: config,
+ Config: config,
}
state.Put("communicator", comm)
diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index d15713339..9f4c9e7bc 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -75,10 +75,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Flavor: b.config.Flavor,
},
&StepKeyPair{
- Debug: b.config.PackerDebug,
- DebugKeyPath: fmt.Sprintf("os_%s.pem", b.config.PackerBuildName),
- KeyPairName: b.config.SSHKeyPairName,
- PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey,
+ Debug: b.config.PackerDebug,
+ DebugKeyPath: fmt.Sprintf("os_%s.pem", b.config.PackerBuildName),
+ KeyPairName: b.config.SSHKeyPairName,
+ PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey,
},
&StepRunSourceServer{
Name: b.config.ImageName,
diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index 00f34c9c4..a8b8638dc 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -10,9 +10,9 @@ import (
// RunConfig contains configuration for running an instance from a source
// image and details on how to access that launched image.
type RunConfig struct {
- Comm communicator.Config `mapstructure:",squash"`
+ Comm communicator.Config `mapstructure:",squash"`
SSHKeyPairName string `mapstructure:"ssh_keypair_name"`
- SSHInterface string `mapstructure:"ssh_interface"`
+ SSHInterface string `mapstructure:"ssh_interface"`
SourceImage string `mapstructure:"source_image"`
Flavor string `mapstructure:"flavor"`
diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go
index 97dbf7515..f17d76f35 100644
--- a/builder/openstack/step_key_pair.go
+++ b/builder/openstack/step_key_pair.go
@@ -13,12 +13,12 @@ import (
)
type StepKeyPair struct {
- Debug bool
- DebugKeyPath string
- KeyPairName string
- PrivateKeyFile string
+ Debug bool
+ DebugKeyPath string
+ KeyPairName string
+ PrivateKeyFile string
- keyName string
+ keyName string
}
func (s *StepKeyPair) Run(state multistep.StateBag) multistep.StepAction {
diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go
index 498033925..62b3732de 100644
--- a/provisioner/chef-client/provisioner.go
+++ b/provisioner/chef-client/provisioner.go
@@ -287,10 +287,10 @@ func (p *Provisioner) createKnifeConfig(ui packer.Ui, comm packer.Communicator,
ctx := p.config.ctx
ctx.Data = &ConfigTemplate{
- NodeName: nodeName,
- ServerUrl: serverUrl,
- ClientKey: clientKey,
- SslVerifyMode: sslVerifyMode,
+ NodeName: nodeName,
+ ServerUrl: serverUrl,
+ ClientKey: clientKey,
+ SslVerifyMode: sslVerifyMode,
}
configString, err := interpolate.Render(tpl, &ctx)
if err != nil {