From 68ca7490bbb465964ce2d4e5070d4dcecbbe42d4 Mon Sep 17 00:00:00 2001 From: jasminSPC Date: Thu, 17 Nov 2016 21:15:28 +0100 Subject: [PATCH] Removed default value for ssh_username --- builder/oneandone/config.go | 4 ---- builder/profitbricks/config.go | 3 --- website/source/docs/builders/oneandone.html.md | 3 ++- website/source/docs/builders/profitbricks.html.md | 1 + 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index 6187cd14f..fcc3fca97 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -65,10 +65,6 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { errs, errors.New("1&1 'image' is required")) } - if c.Comm.SSHUsername == "" { - c.Comm.SSHUsername = "root" - } - if c.Token == "" { c.Token = os.Getenv("ONEANDONE_TOKEN") } diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index bc51decde..79c697a19 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -56,9 +56,6 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { errs = packer.MultiErrorAppend( errs, errors.New("Either ssh private key path or ssh password must be set.")) } - if c.Comm.SSHUsername == "" { - c.Comm.SSHUsername = "root" - } if c.SnapshotName == "" { def, err := interpolate.Render("packer-{{timestamp}}", nil) diff --git a/website/source/docs/builders/oneandone.html.md b/website/source/docs/builders/oneandone.html.md index a74212c47..8b81849f9 100644 --- a/website/source/docs/builders/oneandone.html.md +++ b/website/source/docs/builders/oneandone.html.md @@ -53,7 +53,8 @@ Here is a basic example: "type":"oneandone", "disk_size":"50", "image_name":"test5", - "source_image_name":"ubuntu1604-64min" + "source_image_name":"ubuntu1604-64min", + "ssh_username" :"root" } ] } diff --git a/website/source/docs/builders/profitbricks.html.md b/website/source/docs/builders/profitbricks.html.md index 30a494348..e84890544 100644 --- a/website/source/docs/builders/profitbricks.html.md +++ b/website/source/docs/builders/profitbricks.html.md @@ -65,6 +65,7 @@ Here is a basic example: "snapshot_name": "double", "ssh_key_path": "/path/to/private/key", "snapshot_password": "test1234", + "ssh_username" :"root", "timeout": 100 } ]