From 7dcd7cac4731d520c89ea0dab052d523ca8a9077 Mon Sep 17 00:00:00 2001
From: Andrew Pryde <andrew.pryde@oracle.com>
Date: Mon, 13 Feb 2017 12:37:27 +0000
Subject: [PATCH] Remove default SSHUsername in oracle-bmcs config

---
 builder/oracle/bmcs/config.go      | 4 ----
 builder/oracle/bmcs/config_test.go | 3 +++
 builder/oracle/bmcs/step_test.go   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/builder/oracle/bmcs/config.go b/builder/oracle/bmcs/config.go
index 3a0f1a48d..de0c9a2fe 100644
--- a/builder/oracle/bmcs/config.go
+++ b/builder/oracle/bmcs/config.go
@@ -122,10 +122,6 @@ func NewConfig(raws ...interface{}) (*Config, error) {
 		}
 	}
 
-	if c.Comm.SSHUsername == "" {
-		c.Comm.SSHUsername = "opc"
-	}
-
 	var errs *packer.MultiError
 	if es := c.Comm.Prepare(&c.ctx); len(es) > 0 {
 		errs = packer.MultiErrorAppend(errs, es...)
diff --git a/builder/oracle/bmcs/config_test.go b/builder/oracle/bmcs/config_test.go
index 2f74efae8..135828d13 100644
--- a/builder/oracle/bmcs/config_test.go
+++ b/builder/oracle/bmcs/config_test.go
@@ -28,6 +28,9 @@ func testConfig(accessConfFile *os.File) map[string]interface{} {
 
 		// Networking
 		"subnet_ocid": "ocd1...",
+
+		// Comm
+		"ssh_username": "opc",
 	}
 }
 
diff --git a/builder/oracle/bmcs/step_test.go b/builder/oracle/bmcs/step_test.go
index a8adb7f6f..df954cdd5 100644
--- a/builder/oracle/bmcs/step_test.go
+++ b/builder/oracle/bmcs/step_test.go
@@ -40,6 +40,9 @@ func baseTestConfig() *Config {
 		"tenancy_ocid": "ocid1...",
 		"fingerprint":  "00:00...",
 		"key_file":     keyFile.Name(),
+
+		// Comm
+		"ssh_username": "opc",
 	})
 
 	// Once we have a config object they key file isn't re-read so we can