support reading config in csi cinder driver

Author: edisonxiang

app/cinderplugin/main.go

@@ -27,6 +27,7 @@ import (
 var (
 	endpoint string
 	nodeID   string
+	config   string
 )
 
 func main() {
@@ -44,6 +45,9 @@ func main() {
 	cmd.PersistentFlags().StringVar(&endpoint, "endpoint", "", "CSI endpoint")
 	cmd.MarkPersistentFlagRequired("endpoint")
 
+	cmd.PersistentFlags().StringVar(&config, "config", "", "CSI drive config")
+	cmd.MarkPersistentFlagRequired("config")
+
 	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "%s", err.Error())
 		os.Exit(1)
@@ -53,6 +57,6 @@ func main() {
 }
 
 func handle() {
-	d := cinder.NewDriver(nodeID, endpoint)
+	d := cinder.NewDriver(nodeID, endpoint, config)
 	d.Run()
 }

pkg/cinder/README.md

@@ -4,12 +4,7 @@
 
 ### Start Cinder driver
 ```
-$ export OS_USERNAME=admin
-$ export OS_PASSWORD=password
-$ export OS_TENANT_NAME=admin
-$ export OS_AUTH_URL="http://10.0.0.1/identity"
-$ export OS_DOMAIN_NAME=Default
-$ sudo ./_output/cinderplugin --endpoint tcp://127.0.0.1:10000 --nodeid CSINodeID
+$ sudo ./_output/cinderplugin --endpoint tcp://127.0.0.1:10000 --config /etc/openstack.conf --nodeid CSINodeID
 ```
 
 ### Test using csc

pkg/cinder/controllerserver_test.go

@@ -30,7 +30,7 @@ var fakeCs *controllerServer
 // Init Controller Server
 func init() {
 	if fakeCs == nil {
-		d := NewDriver(fakeNodeID, fakeEndpoint)
+		d := NewDriver(fakeNodeID, fakeEndpoint, fakeConfig)
 		fakeCs = NewControllerServer(d)
 	}
 }

pkg/cinder/driver.go

@@ -20,12 +20,14 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/glog"
 
+	"github.com/kubernetes-csi/drivers/pkg/cinder/openstack"
 	"github.com/kubernetes-csi/drivers/pkg/csi-common"
 )
 
 type driver struct {
 	csiDriver *csicommon.CSIDriver
 	endpoint  string
+	config    string
 
 	ids *csicommon.DefaultIdentityServer
 	cs  *controllerServer
@@ -49,12 +51,13 @@ func GetSupportedVersions() []*csi.Version {
 	return []*csi.Version{&version}
 }
 
-func NewDriver(nodeID, endpoint string) *driver {
+func NewDriver(nodeID, endpoint string, config string) *driver {
 	glog.Infof("Driver: %v version: %v", driverName, csicommon.GetVersionString(&version))
 
 	d := &driver{}
 
 	d.endpoint = endpoint
+	d.config = config
 
 	csiDriver := csicommon.NewCSIDriver(driverName, &version, GetSupportedVersions(), nodeID)
 	csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME})
@@ -79,5 +82,6 @@ func NewNodeServer(d *driver) *nodeServer {
 }
 
 func (d *driver) Run() {
+	openstack.InitOpenStackProvider(d.config)
 	csicommon.RunControllerandNodePublishServer(d.endpoint, d.csiDriver, NewControllerServer(d), NewNodeServer(d))
 }

pkg/cinder/fake.go

@@ -22,6 +22,7 @@ import (
 
 var fakeNodeID = "CSINodeID"
 var fakeEndpoint = "tcp://127.0.0.1:10000"
+var fakeConfig = "/etc/openstack.conf"
 var fakeCtx = context.Background()
 var fakeVolName = "CSIVolumeName"
 var fakeVolID = "CSIVolumeID"

pkg/cinder/nodeserver_test.go

@@ -30,7 +30,7 @@ var fakeNs *nodeServer
 // Init Node Server
 func init() {
 	if fakeNs == nil {
-		d := NewDriver(fakeNodeID, fakeEndpoint)
+		d := NewDriver(fakeNodeID, fakeEndpoint, fakeConfig)
 		fakeNs = NewNodeServer(d)
 	}
 }

pkg/cinder/openstack/openstack.go

@@ -19,8 +19,10 @@ package openstack
 import (
 	"os"
 
+	"github.com/golang/glog"
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
+	"gopkg.in/gcfg.v1"
 )
 
 type IOpenStack interface {
@@ -38,15 +40,93 @@ type OpenStack struct {
 	blockstorage *gophercloud.ServiceClient
 }
 
+type Config struct {
+	Global struct {
+		AuthUrl    string `gcfg:"auth-url"`
+		Username   string
+		UserId     string `gcfg:"user-id"`
+		Password   string
+		TenantId   string `gcfg:"tenant-id"`
+		TenantName string `gcfg:"tenant-name"`
+		DomainId   string `gcfg:"domain-id"`
+		DomainName string `gcfg:"domain-name"`
+		Region     string
+	}
+}
+
+func (cfg Config) toAuthOptions() gophercloud.AuthOptions {
+	return gophercloud.AuthOptions{
+		IdentityEndpoint: cfg.Global.AuthUrl,
+		Username:         cfg.Global.Username,
+		UserID:           cfg.Global.UserId,
+		Password:         cfg.Global.Password,
+		TenantID:         cfg.Global.TenantId,
+		TenantName:       cfg.Global.TenantName,
+		DomainID:         cfg.Global.DomainId,
+		DomainName:       cfg.Global.DomainName,
+
+		// Persistent service, so we need to be able to renew tokens.
+		AllowReauth: true,
+	}
+}
+
+func getConfigFromFile(configFilePath string) (gophercloud.AuthOptions, string, error) {
+	// Get config from file
+	var opts gophercloud.AuthOptions
+	config, err := os.Open(configFilePath)
+	if err != nil {
+		glog.V(3).Infof("Failed to open OpenStack configuration file: %v", err)
+		return opts, "", err
+	}
+	defer config.Close()
+
+	// Read configuration
+	var cfg Config
+	err = gcfg.ReadInto(&cfg, config)
+	if err != nil {
+		glog.V(3).Infof("Failed to read OpenStack configuration file: %v", err)
+		return opts, "", err
+	}
+
+	opts = cfg.toAuthOptions()
+	region := cfg.Global.Region
+
+	return opts, region, nil
+}
+
+func getConfigFromEnv() (gophercloud.AuthOptions, string, error) {
+	// Get config from env
+	opts, err := openstack.AuthOptionsFromEnv()
+	if err != nil {
+		glog.V(3).Infof("Failed to read OpenStack configuration from env: %v", err)
+		return opts, "", err
+	}
+
+	// Get Region from env
+	region := os.Getenv("OS_REGION_NAME")
+
+	return opts, region, nil
+}
+
 var OsInstance IOpenStack = nil
+var configFile string = "/etc/openstack.conf"
+
+func InitOpenStackProvider(cfg string) {
+	configFile = cfg
+	glog.V(2).Infof("InitOpenStackProvider configFile: %s", configFile)
+}
 
 func GetOpenStackProvider() (IOpenStack, error) {
 
 	if OsInstance == nil {
-		// Get config from env
-		opts, err := openstack.AuthOptionsFromEnv()
+		// Get config from file
+		opts, region, err := getConfigFromFile(configFile)
 		if err != nil {
-			return nil, err
+			// Get config from env
+			opts, region, err = getConfigFromEnv()
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		// Authenticate Client
@@ -55,8 +135,6 @@ func GetOpenStackProvider() (IOpenStack, error) {
 			return nil, err
 		}
 
-		region := os.Getenv("OS_REGION_NAME")
-
 		// Init Nova ServiceClient
 		computeclient, err := openstack.NewComputeV2(provider, gophercloud.EndpointOpts{
 			Region: region,