Merge pull request #854 from flaper87/actuator-clouds

Only copy credentials for the cloud used to deploy OCP

Gopkg.toml

@@ -91,3 +91,7 @@ ignored = [
 [[constraint]]
   name = "github.com/openshift/client-go"
   revision = "1fa528d3be060e4c7178eb69e76d37cf7e699e3c"
+
+[[constraint]]
+  name = "github.com/go-yaml/yaml"
+  version = "2.2.2"

pkg/asset/manifests/openshift.go

@@ -5,7 +5,14 @@ import (
 	"path/filepath"
 
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/ghodss/yaml"
+
+	// TODO(flaper87): Migrate to ghodss asap
+	// This yaml is currently used only by the OpenStack
+	// clouds serialization. We're working on migrating
+	// clientconfig out of go-yaml. We'll use it here
+	// until that happens.
+	// https://github.com/openshift/installer/pull/854
+	"gopkg.in/yaml.v2"
 
 	"github.com/gophercloud/utils/openstack/clientconfig"
 	"github.com/openshift/installer/pkg/asset"
@@ -76,10 +83,15 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 			},
 		}
 	case "openstack":
-		clouds, err := clientconfig.LoadCloudsYAML()
+		opts := new(clientconfig.ClientOpts)
+		cloud, err := clientconfig.GetCloudFromYAML(opts)
 		if err != nil {
 			return err
 		}
+		clouds := make(map[string]map[string]*clientconfig.Cloud)
+		clouds["clouds"] = map[string]*clientconfig.Cloud{
+			"openstack": cloud,
+		}
 
 		marshalled, err := yaml.Marshal(clouds)
 		if err != nil {