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
b92aed55
Commit
b92aed55
authored
Sep 07, 2013
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
provisioner/puppet-masterless: more sane messaging
parent
023678fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
provisioner/puppet-masterless/provisioner.go
provisioner/puppet-masterless/provisioner.go
+2
-3
No files found.
provisioner/puppet-masterless/provisioner.go
View file @
b92aed55
...
@@ -149,7 +149,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
...
@@ -149,7 +149,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
// Upload all modules
// Upload all modules
modulePaths
:=
make
([]
string
,
0
,
len
(
p
.
config
.
ModulePaths
))
modulePaths
:=
make
([]
string
,
0
,
len
(
p
.
config
.
ModulePaths
))
for
i
,
path
:=
range
p
.
config
.
ModulePaths
{
for
i
,
path
:=
range
p
.
config
.
ModulePaths
{
ui
.
Message
(
fmt
.
Sprintf
(
"Upload local modules from: %s"
,
path
))
ui
.
Message
(
fmt
.
Sprintf
(
"Upload
ing
local modules from: %s"
,
path
))
targetPath
:=
fmt
.
Sprintf
(
"%s/module-%d"
,
p
.
config
.
StagingDir
,
i
)
targetPath
:=
fmt
.
Sprintf
(
"%s/module-%d"
,
p
.
config
.
StagingDir
,
i
)
if
err
:=
p
.
uploadDirectory
(
ui
,
comm
,
targetPath
,
path
);
err
!=
nil
{
if
err
:=
p
.
uploadDirectory
(
ui
,
comm
,
targetPath
,
path
);
err
!=
nil
{
return
fmt
.
Errorf
(
"Error uploading modules: %s"
,
err
)
return
fmt
.
Errorf
(
"Error uploading modules: %s"
,
err
)
...
@@ -179,7 +179,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
...
@@ -179,7 +179,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
Command
:
command
,
Command
:
command
,
}
}
ui
.
Message
(
"Running Puppet..."
)
ui
.
Message
(
fmt
.
Sprintf
(
"Running Puppet: %s"
,
command
)
)
if
err
:=
cmd
.
StartWithUi
(
comm
,
ui
);
err
!=
nil
{
if
err
:=
cmd
.
StartWithUi
(
comm
,
ui
);
err
!=
nil
{
return
err
return
err
}
}
...
@@ -222,7 +222,6 @@ func (p *Provisioner) uploadManifests(ui packer.Ui, comm packer.Communicator) (s
...
@@ -222,7 +222,6 @@ func (p *Provisioner) uploadManifests(ui packer.Ui, comm packer.Communicator) (s
}
}
func
(
p
*
Provisioner
)
createDir
(
ui
packer
.
Ui
,
comm
packer
.
Communicator
,
dir
string
)
error
{
func
(
p
*
Provisioner
)
createDir
(
ui
packer
.
Ui
,
comm
packer
.
Communicator
,
dir
string
)
error
{
ui
.
Message
(
fmt
.
Sprintf
(
"Creating directory: %s"
,
dir
))
cmd
:=
&
packer
.
RemoteCmd
{
cmd
:=
&
packer
.
RemoteCmd
{
Command
:
fmt
.
Sprintf
(
"mkdir -p '%s'"
,
dir
),
Command
:
fmt
.
Sprintf
(
"mkdir -p '%s'"
,
dir
),
}
}
...
...
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