Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
715662f6
Commit
715662f6
authored
Jul 27, 2015
by
Chris Bednarski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reformat
parent
ff6a0915
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
18 deletions
+18
-18
builder/docker/communicator.go
builder/docker/communicator.go
+2
-2
builder/docker/step_connect_docker.go
builder/docker/step_connect_docker.go
+1
-1
builder/openstack/builder.go
builder/openstack/builder.go
+4
-4
builder/openstack/run_config.go
builder/openstack/run_config.go
+2
-2
builder/openstack/step_key_pair.go
builder/openstack/step_key_pair.go
+5
-5
provisioner/chef-client/provisioner.go
provisioner/chef-client/provisioner.go
+4
-4
No files found.
builder/docker/communicator.go
View file @
715662f6
...
@@ -24,8 +24,8 @@ type Communicator struct {
...
@@ -24,8 +24,8 @@ type Communicator struct {
HostDir
string
HostDir
string
ContainerDir
string
ContainerDir
string
Version
*
version
.
Version
Version
*
version
.
Version
Config
*
Config
Config
*
Config
lock
sync
.
Mutex
lock
sync
.
Mutex
}
}
func
(
c
*
Communicator
)
Start
(
remote
*
packer
.
RemoteCmd
)
error
{
func
(
c
*
Communicator
)
Start
(
remote
*
packer
.
RemoteCmd
)
error
{
...
...
builder/docker/step_connect_docker.go
View file @
715662f6
...
@@ -26,7 +26,7 @@ func (s *StepConnectDocker) Run(state multistep.StateBag) multistep.StepAction {
...
@@ -26,7 +26,7 @@ func (s *StepConnectDocker) Run(state multistep.StateBag) multistep.StepAction {
HostDir
:
tempDir
,
HostDir
:
tempDir
,
ContainerDir
:
"/packer-files"
,
ContainerDir
:
"/packer-files"
,
Version
:
version
,
Version
:
version
,
Config
:
config
,
Config
:
config
,
}
}
state
.
Put
(
"communicator"
,
comm
)
state
.
Put
(
"communicator"
,
comm
)
...
...
builder/openstack/builder.go
View file @
715662f6
...
@@ -75,10 +75,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
...
@@ -75,10 +75,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Flavor
:
b
.
config
.
Flavor
,
Flavor
:
b
.
config
.
Flavor
,
},
},
&
StepKeyPair
{
&
StepKeyPair
{
Debug
:
b
.
config
.
PackerDebug
,
Debug
:
b
.
config
.
PackerDebug
,
DebugKeyPath
:
fmt
.
Sprintf
(
"os_%s.pem"
,
b
.
config
.
PackerBuildName
),
DebugKeyPath
:
fmt
.
Sprintf
(
"os_%s.pem"
,
b
.
config
.
PackerBuildName
),
KeyPairName
:
b
.
config
.
SSHKeyPairName
,
KeyPairName
:
b
.
config
.
SSHKeyPairName
,
PrivateKeyFile
:
b
.
config
.
RunConfig
.
Comm
.
SSHPrivateKey
,
PrivateKeyFile
:
b
.
config
.
RunConfig
.
Comm
.
SSHPrivateKey
,
},
},
&
StepRunSourceServer
{
&
StepRunSourceServer
{
Name
:
b
.
config
.
ImageName
,
Name
:
b
.
config
.
ImageName
,
...
...
builder/openstack/run_config.go
View file @
715662f6
...
@@ -10,9 +10,9 @@ import (
...
@@ -10,9 +10,9 @@ import (
// RunConfig contains configuration for running an instance from a source
// RunConfig contains configuration for running an instance from a source
// image and details on how to access that launched image.
// image and details on how to access that launched image.
type
RunConfig
struct
{
type
RunConfig
struct
{
Comm
communicator
.
Config
`mapstructure:",squash"`
Comm
communicator
.
Config
`mapstructure:",squash"`
SSHKeyPairName
string
`mapstructure:"ssh_keypair_name"`
SSHKeyPairName
string
`mapstructure:"ssh_keypair_name"`
SSHInterface
string
`mapstructure:"ssh_interface"`
SSHInterface
string
`mapstructure:"ssh_interface"`
SourceImage
string
`mapstructure:"source_image"`
SourceImage
string
`mapstructure:"source_image"`
Flavor
string
`mapstructure:"flavor"`
Flavor
string
`mapstructure:"flavor"`
...
...
builder/openstack/step_key_pair.go
View file @
715662f6
...
@@ -13,12 +13,12 @@ import (
...
@@ -13,12 +13,12 @@ import (
)
)
type
StepKeyPair
struct
{
type
StepKeyPair
struct
{
Debug
bool
Debug
bool
DebugKeyPath
string
DebugKeyPath
string
KeyPairName
string
KeyPairName
string
PrivateKeyFile
string
PrivateKeyFile
string
keyName
string
keyName
string
}
}
func
(
s
*
StepKeyPair
)
Run
(
state
multistep
.
StateBag
)
multistep
.
StepAction
{
func
(
s
*
StepKeyPair
)
Run
(
state
multistep
.
StateBag
)
multistep
.
StepAction
{
...
...
provisioner/chef-client/provisioner.go
View file @
715662f6
...
@@ -287,10 +287,10 @@ func (p *Provisioner) createKnifeConfig(ui packer.Ui, comm packer.Communicator,
...
@@ -287,10 +287,10 @@ func (p *Provisioner) createKnifeConfig(ui packer.Ui, comm packer.Communicator,
ctx
:=
p
.
config
.
ctx
ctx
:=
p
.
config
.
ctx
ctx
.
Data
=
&
ConfigTemplate
{
ctx
.
Data
=
&
ConfigTemplate
{
NodeName
:
nodeName
,
NodeName
:
nodeName
,
ServerUrl
:
serverUrl
,
ServerUrl
:
serverUrl
,
ClientKey
:
clientKey
,
ClientKey
:
clientKey
,
SslVerifyMode
:
sslVerifyMode
,
SslVerifyMode
:
sslVerifyMode
,
}
}
configString
,
err
:=
interpolate
.
Render
(
tpl
,
&
ctx
)
configString
,
err
:=
interpolate
.
Render
(
tpl
,
&
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment