Merge pull request #22 from PatrykMatyjasek/pm-auth-api-v3-support

Add support for authentication API v3

README.md

@@ -56,6 +56,9 @@ Configuration for this plugin is given via global config. Global configuration f
 -  `"openstack_pass"`- password used to authenticate (ex. `"admin"`),
 -  `"openstack_tenant"` - tenant name used to authenticate (ex. `"admin"`),
 -  `"openstack_auth_url"` - keystone url (ex. `"http://172.16.0.5:5000/v2.0/"`).
+If you're using authentication API in v3 you need to set one of those two configuration options (Note that both keys should be present in config, but only one of them is allowed to be set):
+- `"openstack_domain_name"` - domain name
+- `"openstack_domain_id"` - domain name
 
 These values should correspond to values given in `nova.conf`:
 -  `"allocation_ratio_cores"` - oversubscription ratio for vcpus, used to derive some metrics for hypervisors (ex. 1.5),

examples/cfg/cfg.json

@@ -8,6 +8,8 @@
                     "openstack_user": "admin",
                     "openstack_pass": "admin",
                     "openstack_tenant": "admin",
+                    "openstack_domain_id": "",
+                    "openstack_domain_name": "",
                     "allocation_ratio_cores" : 1.5,
                     "allocation_ratio_ram": 3,
                     "reserved_node_cores" : 2,

novaplugin/collector.go

@@ -97,6 +97,8 @@ func newCollector(config Config) (collectorInterface, error) {
 		Username:         config.User,
 		Password:         config.Pass,
 		TenantName:       config.Tenant,
+		DomainID:         config.DomaninID,
+		DomainName:       config.DomainName,
 		AllowReauth:      true,
 	}
 

novaplugin/plugin.go

@@ -44,10 +44,12 @@ const (
 )
 
 type Config struct {
-	User   string `c:"openstack_user"`
-	Pass   string `c:"openstack_pass"`
-	Tenant string `c:"openstack_tenant"`
-	Url    string `c:"openstack_auth_url"`
+	User       string `c:"openstack_user"`
+	Pass       string `c:"openstack_pass"`
+	Tenant     string `c:"openstack_tenant"`
+	Url        string `c:"openstack_auth_url"`
+	DomainName string `c:"openstack_domain_name"`
+	DomaninID  string `c:"openstack_domain_id"`
 
 	RatioCores     float64 `c:"allocation_ratio_cores"`
 	RatioRam       float64 `c:"allocation_ratio_ram"`

novaplugin/plugin_test.go

@@ -47,11 +47,15 @@ func testingConfig() (cfg1 plugin.ConfigType, cfg2 *cdata.ConfigDataNode) {
 	cfg1.AddItem("openstack_pass", ctypes.ConfigValueStr{Value: "x"})
 	cfg1.AddItem("openstack_tenant", ctypes.ConfigValueStr{Value: "asdf"})
 	cfg1.AddItem("openstack_auth_url", ctypes.ConfigValueStr{Value: "x"})
+	cfg1.AddItem("openstack_domain_id", ctypes.ConfigValueStr{Value: ""})
+	cfg1.AddItem("openstack_domain_name", ctypes.ConfigValueStr{Value: ""})
 
 	cfg2.AddItem("openstack_user", ctypes.ConfigValueStr{Value: "x"})
 	cfg2.AddItem("openstack_pass", ctypes.ConfigValueStr{Value: "x"})
 	cfg2.AddItem("openstack_tenant", ctypes.ConfigValueStr{Value: "asdf"})
 	cfg2.AddItem("openstack_auth_url", ctypes.ConfigValueStr{Value: "x"})
+	cfg2.AddItem("openstack_domain_id", ctypes.ConfigValueStr{Value: ""})
+	cfg2.AddItem("openstack_domain_name", ctypes.ConfigValueStr{Value: ""})
 
 	cfg1.AddItem("allocation_ratio_cores", ctypes.ConfigValueFloat{Value: 3})
 	cfg1.AddItem("allocation_ratio_ram", ctypes.ConfigValueFloat{Value: 4})