From a5d01a35390829092f8e5bd718921bbd52718a3d Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 27 Jul 2017 12:55:22 -0700 Subject: [PATCH] cloudprovider/photon: remove unneeded bash exec --- pkg/cloudprovider/providers/photon/photon.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkg/cloudprovider/providers/photon/photon.go b/pkg/cloudprovider/providers/photon/photon.go index 8ef0b1dcfcc..c03e78ef9e7 100644 --- a/pkg/cloudprovider/providers/photon/photon.go +++ b/pkg/cloudprovider/providers/photon/photon.go @@ -31,7 +31,6 @@ import ( "log" "net" "os" - "os/exec" "strings" "github.com/golang/glog" @@ -268,18 +267,11 @@ func newPCCloud(cfg PCConfig) (*PCCloud, error) { vmID := cfg.Global.VMID // Get local hostname - cmd := exec.Command("bash", "-c", `echo $HOSTNAME`) - out, err := cmd.CombinedOutput() + hostname, err := os.Hostname() if err != nil { - glog.Errorf("Photon Cloud Provider: get local hostname bash command failed. Error[%v]", err) + glog.Errorf("Photon Cloud Provider: get hostname failed. Error[%v]", err) return nil, err } - if len(out) == 0 { - glog.Errorf("unable to retrieve hostname for Instance ID") - return nil, fmt.Errorf("unable to retrieve hostname for Instance ID") - } - hostname := strings.TrimRight(string(out), "\n") - pc := PCCloud{ cfg: &cfg, localInstanceID: vmID,