aherman
/
packer
mirror of https://github.com/hashicorp/packer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*: switch to packer ConfigTemplate

Browse Source
pull/302/head
Mitchell Hashimoto 13 years ago
parent f19dcf15e1
commit a1a7ff20c2
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
builder/amazon/chroot/builder.go
Unescape View File

@ -34,7 +34,7 @@ type Config struct {
SourceAmi string `mapstructure:"source_ami"`
UnmountCommand string `mapstructure:"unmount_command"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Builder struct {
@ -48,7 +48,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

6
builder/amazon/common/access_config.go
Unescape View File

@ -3,7 +3,7 @@ package common
import (
"fmt"
"github.com/mitchellh/goamz/aws"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
"strings"
"unicode"
)
@ -37,10 +37,10 @@ func (c *AccessConfig) Region() (aws.Region, error) {
return aws.Regions[region], nil
}
func (c *AccessConfig) Prepare(t *common.Template) []error {
func (c *AccessConfig) Prepare(t *packer.ConfigTemplate) []error {
if t == nil {
var err error
t, err = common.NewTemplate()
t, err = packer.NewConfigTemplate()
if err != nil {
return []error{err}
}

6
builder/amazon/common/ami_config.go
Unescape View File

@ -2,7 +2,7 @@ package common
import (
"fmt"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
)
// AMIConfig is for common configuration related to creating AMIs.
@ -14,10 +14,10 @@ type AMIConfig struct {
AMIProductCodes []string `mapstructure:"ami_product_codes"`
}
func (c *AMIConfig) Prepare(t *common.Template) []error {
func (c *AMIConfig) Prepare(t *packer.ConfigTemplate) []error {
if t == nil {
var err error
t, err = common.NewTemplate()
t, err = packer.NewConfigTemplate()
if err != nil {
return []error{err}
}

6
builder/amazon/common/run_config.go
Unescape View File

@ -3,7 +3,7 @@ package common
import (
"errors"
"fmt"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
"os"
"time"
)
@ -27,10 +27,10 @@ type RunConfig struct {
sshTimeout time.Duration
}
func (c *RunConfig) Prepare(t *common.Template) []error {
func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error {
if t == nil {
var err error
t, err = common.NewTemplate()
t, err = packer.NewConfigTemplate()
if err != nil {
return []error{err}
}

4
builder/amazon/ebs/builder.go
Unescape View File

@ -28,7 +28,7 @@ type config struct {
// Tags for the AMI
Tags map[string]string
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Builder struct {
@ -42,7 +42,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
builder/amazon/instance/builder.go
Unescape View File

@ -38,7 +38,7 @@ type Config struct {
X509KeyPath string `mapstructure:"x509_key_path"`
X509UploadPath string `mapstructure:"x509_upload_path"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Builder struct {
@ -52,7 +52,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
builder/digitalocean/builder.go
Unescape View File

@ -43,7 +43,7 @@ type config struct {
eventDelay time.Duration
stateTimeout time.Duration
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Builder struct {
@ -57,7 +57,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
builder/virtualbox/builder.go
Unescape View File

@ -57,7 +57,7 @@ type config struct {
bootWait time.Duration ``
shutdownTimeout time.Duration ``
sshWaitTimeout time.Duration ``
tpl *common.Template
tpl *packer.ConfigTemplate
}
func (b *Builder) Prepare(raws ...interface{}) error {
@ -66,7 +66,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
builder/vmware/builder.go
Unescape View File

@ -58,7 +58,7 @@ type config struct {
bootWait time.Duration ``
shutdownTimeout time.Duration ``
sshWaitTimeout time.Duration ``
tpl *common.Template
tpl *packer.ConfigTemplate
}
func (b *Builder) Prepare(raws ...interface{}) error {
@ -67,7 +67,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
return err
}
b.config.tpl, err = common.NewTemplate()
b.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
post-processor/vagrant/aws.go
Unescape View File

@ -17,7 +17,7 @@ type AWSBoxConfig struct {
OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type AWSVagrantfileTemplate struct {
@ -34,7 +34,7 @@ func (p *AWSBoxPostProcessor) Configure(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
post-processor/vagrant/virtualbox.go
Unescape View File

@ -19,7 +19,7 @@ type VBoxBoxConfig struct {
OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type VBoxVagrantfileTemplate struct {
@ -36,7 +36,7 @@ func (p *VBoxBoxPostProcessor) Configure(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
post-processor/vagrant/vmware.go
Unescape View File

@ -15,7 +15,7 @@ type VMwareBoxConfig struct {
OutputPath string `mapstructure:"output"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type VMwareBoxPostProcessor struct {
@ -28,7 +28,7 @@ func (p *VMwareBoxPostProcessor) Configure(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
provisioner/file/provisioner.go
Unescape View File

@ -17,7 +17,7 @@ type config struct {
// The remote path where the local file will be uploaded to.
Destination string
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Provisioner struct {
@ -30,7 +30,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
provisioner/salt-masterless/provisioner.go
Unescape View File

@ -27,7 +27,7 @@ type Config struct {
// Where files will be copied before moving to the /srv/salt directory
TempConfigDir string `mapstructure:"temp_config_dir"`
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Provisioner struct {
@ -40,7 +40,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

4
provisioner/shell/provisioner.go
Unescape View File

@ -52,7 +52,7 @@ type config struct {
RawStartRetryTimeout string `mapstructure:"start_retry_timeout"`
startRetryTimeout time.Duration
tpl *common.Template
tpl *packer.ConfigTemplate
}
type Provisioner struct {
@ -70,7 +70,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
return err
}
p.config.tpl, err = common.NewTemplate()
p.config.tpl, err = packer.NewConfigTemplate()
if err != nil {
return err
}

Write Preview
Loading…
Cancel
Save