openstack: Use openstack as a cloud name for our credentials

pkg/asset/machines/openstack/machines.go

@@ -15,6 +15,11 @@ import (
 	"github.com/openshift/installer/pkg/types/openstack"
 )
 
+// TODO(flaper87): We're choosing to hardcode these two values
+// to make the environment more predictable. We expect there to
+// a secret named `openstack-credentials` and a cloud named `openstack`
+// in the clouds file stored in this secret.
+const CloudName = "openstack"
 const cloudsSecret = "openstack-credentials"
 
 // Machines returns a list of machines for a machinepool.
@@ -80,7 +85,7 @@ func provider(clusterID, clusterName string, platform *openstack.Platform, mpool
 			Size:       pointer.Int64Ptr(int64(mpool.Size)),
 		},*/
 		Image:          osImage,
-		CloudName:      platform.Cloud,
+		CloudName:      CloudName,
 		CloudsSecret:   &corev1.SecretReference{Name: cloudsSecret},
 		UserDataSecret: &corev1.SecretReference{Name: userDataSecret},
 		Networks: []openstackprovider.NetworkParam{

pkg/asset/manifests/openshift.go

@@ -18,6 +18,7 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/machines"
+	osmachine "github.com/openshift/installer/pkg/asset/machines/openstack"
 	"github.com/openshift/installer/pkg/asset/password"
 	"github.com/openshift/installer/pkg/asset/templates/content/openshift"
 )
@@ -91,7 +92,7 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 		}
 		clouds := make(map[string]map[string]*clientconfig.Cloud)
 		clouds["clouds"] = map[string]*clientconfig.Cloud{
-			"openstack": cloud,
+			osmachine.CloudName: cloud,
 		}
 
 		marshalled, err := yaml.Marshal(clouds)