Skip to content

K
k3s
Commit 79f40d68 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #13660 from jsafrane/devel/fix-cloud-init

Auto commit by PR queue bot
parents 6f11647c f7384827
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/cloudprovider/plugins.go
View file @ 79f40d68
...@@ -65,15 +65,16 @@ func GetCloudProvider(name string, config io.Reader) (Interface, error) { ...@@ -65,15 +65,16 @@ func GetCloudProvider(name string, config io.Reader) (Interface, error) {
// InitCloudProvider creates an instance of the named cloud provider. // InitCloudProvider creates an instance of the named cloud provider.
func InitCloudProvider(name string, configFilePath string) (Interface, error) { func InitCloudProvider(name string, configFilePath string) (Interface, error) {
var cloud Interface var cloud Interface
var err error
if name == "" { if name == "" {
glog.Info("No cloud provider specified.") glog.Info("No cloud provider specified.")
return nil, nil return nil, nil
} }
var err error
if configFilePath != "" { if configFilePath != "" {
config, err := os.Open(configFilePath) var config *os.File
config, err = os.Open(configFilePath)
if err != nil { if err != nil {
glog.Fatalf("Couldn't open cloud provider configuration %s: %#v", glog.Fatalf("Couldn't open cloud provider configuration %s: %#v",
configFilePath, err) configFilePath, 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