mantle: use clientconfig from github.com/gophercloud/utils for openstack auth

We can use the clientconfig package to read/parse a clouds.yaml file
with the information needed to connect to the corresponding OpenStack
cloud.

Author: dustymabe

mantle/auth/openstack.go

@@ -117,8 +117,8 @@ func init() {
 	sv(&kola.GCEOptions.JSONKeyFile, "gce-json-key", "", "use a service account's JSON key for authentication")
 
 	// openstack-specific options
-	sv(&kola.OpenStackOptions.ConfigPath, "openstack-config-file", "", "OpenStack config file (default \"~/"+auth.OpenStackConfigPath+"\")")
-	sv(&kola.OpenStackOptions.Profile, "openstack-profile", "", "OpenStack profile (default \"default\")")
+	sv(&kola.OpenStackOptions.ConfigPath, "openstack-config-file", "", "Path to a clouds.yaml formatted OpenStack config file. The underlying library defaults to ./clouds.yaml")
+	sv(&kola.OpenStackOptions.Profile, "openstack-profile", "", "OpenStack profile within clouds.yaml (default \"openstack\")")
 	sv(&kola.OpenStackOptions.Region, "openstack-region", "", "OpenStack region")
 	sv(&kola.OpenStackOptions.Image, "openstack-image", "", "OpenStack image ref")
 	sv(&kola.OpenStackOptions.Flavor, "openstack-flavor", "1", "OpenStack flavor ref")

mantle/cmd/kola/options.go

@@ -20,7 +20,6 @@ import (
 	"github.com/coreos/pkg/capnslog"
 	"github.com/spf13/cobra"
 
-	"github.com/coreos/mantle/auth"
 	"github.com/coreos/mantle/cli"
 	"github.com/coreos/mantle/platform/api/openstack"
 )
@@ -38,8 +37,8 @@ var (
 )
 
 func init() {
-	OpenStack.PersistentFlags().StringVar(&options.ConfigPath, "config-file", "", "config file (default \"~/"+auth.OpenStackConfigPath+"\")")
-	OpenStack.PersistentFlags().StringVar(&options.Profile, "profile", "", "profile (default \"default\")")
+	OpenStack.PersistentFlags().StringVar(&options.ConfigPath, "config-file", "", "Path to a clouds.yaml formatted OpenStack config file. The underlying library defaults to ./clouds.yaml")
+	OpenStack.PersistentFlags().StringVar(&options.Profile, "profile", "", "OpenStack profile within clouds.yaml (default \"openstack\")")
 	cli.WrapPreRun(OpenStack, preflightCheck)
 }
 

mantle/cmd/ore/openstack/openstack.go

@@ -682,6 +682,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20190502103701-55513cacd4ae/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

mantle/go.sum

@@ -34,9 +34,9 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/gophercloud/utils/openstack/clientconfig"
 	utilsSecurityGroups "github.com/gophercloud/utils/openstack/networking/v2/extensions/security/groups"
 
-	"github.com/coreos/mantle/auth"
 	"github.com/coreos/mantle/platform"
 	"github.com/coreos/mantle/util"
 )
@@ -80,60 +80,40 @@ type API struct {
 }
 
 func New(opts *Options) (*API, error) {
-	profiles, err := auth.ReadOpenStackConfig(opts.ConfigPath)
-	if err != nil {
-		return nil, fmt.Errorf("couldn't read OpenStack config: %v", err)
-	}
 
 	if opts.Profile == "" {
-		opts.Profile = "default"
-	}
-	profile, ok := profiles[opts.Profile]
-	if !ok {
-		return nil, fmt.Errorf("no such profile %q", opts.Profile)
+		opts.Profile = "openstack"
 	}
 
-	if opts.Domain == "" {
-		opts.Domain = profile.Domain
+	osOpts := &clientconfig.ClientOpts{
+		Cloud: opts.Profile,
 	}
 
-	osOpts := gophercloud.AuthOptions{
-		IdentityEndpoint: profile.AuthURL,
-		TenantID:         profile.TenantID,
-		TenantName:       profile.TenantName,
-		Username:         profile.Username,
-		Password:         profile.Password,
-		DomainID:         opts.Domain,
+	if opts.Region != "" {
+		osOpts.RegionName = opts.Region
 	}
 
-	provider, err := openstack.AuthenticatedClient(osOpts)
+	provider, err := clientconfig.AuthenticatedClient(osOpts)
 	if err != nil {
 		return nil, fmt.Errorf("failed creating provider: %v", err)
 	}
 
-	if opts.Region == "" {
-		opts.Region = profile.Region
-	}
-
 	computeClient, err := openstack.NewComputeV2(provider, gophercloud.EndpointOpts{
-		Name:   "nova",
-		Region: opts.Region,
+		Name: "nova",
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create compute client: %v", err)
 	}
 
 	imageClient, err := openstack.NewImageServiceV2(provider, gophercloud.EndpointOpts{
-		Name:   "glance",
-		Region: opts.Region,
+		Name: "glance",
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create image client: %v", err)
 	}
 
 	networkClient, err := openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{
-		Name:   "neutron",
-		Region: opts.Region,
+		Name: "neutron",
 	})
 
 	a := &API{
@@ -167,10 +147,6 @@ func New(opts *Options) (*API, error) {
 		a.opts.Network = tmp
 	}
 
-	if a.opts.FloatingIPPool == "" {
-		a.opts.FloatingIPPool = profile.FloatingIPPool
-	}
-
 	return a, nil
 }