Commit dab4d782 authored by Ross Smith II's avatar Ross Smith II

Merge pull request #1329 from OpsRockin/chef-local-paths-on-windows

Fix remotePaths when provisioning Linux from Windows
Fixes #394
parents aa844ef4 18dddb51
...@@ -286,7 +286,7 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, nodeN ...@@ -286,7 +286,7 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, nodeN
return "", err return "", err
} }
remotePath := filepath.Join(p.config.StagingDir, "client.rb") remotePath := filepath.ToSlash(filepath.Join(p.config.StagingDir, "client.rb"))
if err := comm.Upload(remotePath, bytes.NewReader([]byte(configString))); err != nil { if err := comm.Upload(remotePath, bytes.NewReader([]byte(configString))); err != nil {
return "", err return "", err
} }
...@@ -315,7 +315,7 @@ func (p *Provisioner) createJson(ui packer.Ui, comm packer.Communicator) (string ...@@ -315,7 +315,7 @@ func (p *Provisioner) createJson(ui packer.Ui, comm packer.Communicator) (string
} }
// Upload the bytes // Upload the bytes
remotePath := filepath.Join(p.config.StagingDir, "first-boot.json") remotePath := filepath.ToSlash(filepath.Join(p.config.StagingDir, "first-boot.json"))
if err := comm.Upload(remotePath, bytes.NewReader(jsonBytes)); err != nil { if err := comm.Upload(remotePath, bytes.NewReader(jsonBytes)); err != nil {
return "", err return "", err
} }
......
...@@ -378,7 +378,7 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, local ...@@ -378,7 +378,7 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, local
return "", err return "", err
} }
remotePath := filepath.Join(p.config.StagingDir, "solo.rb") remotePath := filepath.ToSlash(filepath.Join(p.config.StagingDir, "solo.rb"))
if err := comm.Upload(remotePath, bytes.NewReader([]byte(configString))); err != nil { if err := comm.Upload(remotePath, bytes.NewReader([]byte(configString))); err != nil {
return "", err return "", err
} }
...@@ -407,7 +407,7 @@ func (p *Provisioner) createJson(ui packer.Ui, comm packer.Communicator) (string ...@@ -407,7 +407,7 @@ func (p *Provisioner) createJson(ui packer.Ui, comm packer.Communicator) (string
} }
// Upload the bytes // Upload the bytes
remotePath := filepath.Join(p.config.StagingDir, "node.json") remotePath := filepath.ToSlash(filepath.Join(p.config.StagingDir, "node.json"))
if err := comm.Upload(remotePath, bytes.NewReader(jsonBytes)); err != nil { if err := comm.Upload(remotePath, bytes.NewReader(jsonBytes)); err != nil {
return "", err return "", err
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment