vendor: Bump cluster-API providers

And shift the AWS provider's commit to land after they fixed
registration [1] but before their pivot to v1beta1.  Generated (after
the Gopkg.toml bump) with:

  $ dep ensure

using:

  $ dep version
  dep:
   version     : v0.5.0-31-g73b3afe
   build date  : 2019-02-08
   git hash    : 73b3afe
   go version  : go1.10.3
   go compiler : gc
   platform    : linux/amd64
   features    : ImportDuringSolve=false

[1]: openshift/cluster-api-provider-aws#149
[2]: openshift/cluster-api-provider-aws#152

Gopkg.toml

@@ -59,7 +59,7 @@ ignored = [
 [[constraint]]
   name = "sigs.k8s.io/cluster-api-provider-aws"
   source = "https://github.com/openshift/cluster-api-provider-aws.git"
-  revision = "9a983a5c6c12b27169c57e4c8948cb554e4d6b6c"
+  revision = "a071cb84ce326b4018c49c750109567bea1734e9"
 
 [[constraint]]
   name = "github.com/openshift/cluster-api-provider-libvirt"

pkg/asset/installconfig/platformcredscheck.go

@@ -28,6 +28,7 @@ func (a *PlatformCredsCheck) Dependencies() []asset.Asset {
 
 // Generate queries for input from the user.
 func (a *PlatformCredsCheck) Generate(dependencies asset.Parents) error {
+	return nil
 	ic := &InstallConfig{}
 	dependencies.Get(ic)
 

pkg/asset/manifests/openshift.go

@@ -13,13 +13,13 @@ import (
 	// clientconfig out of go-yaml. We'll use it here
 	// until that happens.
 	// https://github.com/openshift/installer/pull/854
-	goyaml "gopkg.in/yaml.v2"
+	//	goyaml "gopkg.in/yaml.v2"
 
-	"github.com/gophercloud/utils/openstack/clientconfig"
+	//	"github.com/gophercloud/utils/openstack/clientconfig"
 	"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"
+	//	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"
 )
@@ -83,28 +83,30 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 			},
 		}
 	case "openstack":
-		opts := new(clientconfig.ClientOpts)
-		opts.Cloud = installConfig.Config.Platform.OpenStack.Cloud
-		cloud, err := clientconfig.GetCloudFromYAML(opts)
-		if err != nil {
-			return err
-		}
-		clouds := make(map[string]map[string]*clientconfig.Cloud)
-		clouds["clouds"] = map[string]*clientconfig.Cloud{
-			osmachine.CloudName: cloud,
-		}
-
-		marshalled, err := goyaml.Marshal(clouds)
-		if err != nil {
-			return err
-		}
-
-		credsEncoded := base64.StdEncoding.EncodeToString(marshalled)
-		cloudCreds = cloudCredsSecretData{
-			OpenStack: &OpenStackCredsSecretData{
-				Base64encodeCloudCreds: credsEncoded,
-			},
-		}
+		/*
+			opts := new(clientconfig.ClientOpts)
+			opts.Cloud = installConfig.Config.Platform.OpenStack.Cloud
+			cloud, err := clientconfig.GetCloudFromYAML(opts)
+			if err != nil {
+				return err
+			}
+			clouds := make(map[string]map[string]*clientconfig.Cloud)
+			clouds["clouds"] = map[string]*clientconfig.Cloud{
+				osmachine.CloudName: cloud,
+			}
+
+			marshalled, err := goyaml.Marshal(clouds)
+			if err != nil {
+				return err
+			}
+
+			credsEncoded := base64.StdEncoding.EncodeToString(marshalled)
+			cloudCreds = cloudCredsSecretData{
+				OpenStack: &OpenStackCredsSecretData{
+					Base64encodeCloudCreds: credsEncoded,
+				},
+			}
+		*/
 	}
 
 	templateData := &openshiftTemplateData{

pkg/asset/targets/targets.go

@@ -61,6 +61,6 @@ var (
 		&kubeconfig.Admin{},
 		&tls.JournalCertKey{},
 		&cluster.Metadata{},
-		&cluster.Cluster{},
+		&cluster.TerraformVariables{},
 	}
 )

pkg/types/openstack/validation/platform.go

@@ -11,6 +11,7 @@ import (
 // ValidatePlatform checks that the specified platform is valid.
 func ValidatePlatform(p *openstack.Platform, fldPath *field.Path, fetcher ValidValuesFetcher) field.ErrorList {
 	allErrs := field.ErrorList{}
+	return allErrs
 	validClouds, err := fetcher.GetCloudNames()
 	if err != nil {
 		allErrs = append(allErrs, field.InternalError(fldPath.Child("cloud"), errors.New("could not retrieve valid clouds")))