lib/kaname/config.rb in kaname-0.6.3 vs lib/kaname/config.rb in kaname-0.7.0

@@ -15,11 +15,11 @@
     end
 
     private
 
     def self.envs_exist?
-      %w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME].any?{|k|ENV[k]}
+      %w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME OS_IDENTITY_API_VERSION].any?{|k|ENV[k]}
     end
 
     def self.load_config
       config_file = File.join(Dir.home, '.kaname')
       raise '~/.kaname is missing' unless File.exists?(config_file)
@@ -28,28 +28,34 @@
 
       %w[auth_url tenant username password].each do |conf_item|
         raise "Configuration '#{conf_item}' is missing. Check your ~/.kaname" unless config[conf_item]
       end
 
-      @@auth_url       = config['auth_url']
-      @@tenant         = config['tenant']
-      @@username       = config['username']
-      @@password       = config['password']
-      @@client_cert    = config['client_cert']
-      @@client_key     = config['client_key']
-      @@region_name    = config['region_name']
+      @@auth_url             = config['auth_url']
+      @@tenant               = config['tenant']
+      @@username             = config['username']
+      @@password             = config['password']
+      @@client_cert          = config['client_cert']
+      @@client_key           = config['client_key']
+      @@region_name          = config['region_name']
+      @@user_domain_name     = config['user_domain_name']
+      @@project_domain_name  = config['project_domain_name']
+      @@identity_api_version = config['identity_api_version']
       true
     end
 
     def self.setup_yao
       Yao.configure do
-        auth_url    (ENV['OS_AUTH_URL']    || @@auth_url)
-        tenant_name (ENV['OS_TENANT_NAME'] || @@tenant)
-        username    (ENV['OS_USERNAME']    || @@username)
-        password    (ENV['OS_PASSWORD']    || @@password)
-        client_cert (ENV['OS_CERT']        || @@client_cert)
-        client_key  (ENV['OS_KEY']         || @@client_key)
-        region_name (ENV['OS_REGION_NAME'] || @@region_name)
+        auth_url             (ENV['OS_AUTH_URL']             || @@auth_url)
+        tenant_name          (ENV['OS_TENANT_NAME']          || @@tenant)
+        username             (ENV['OS_USERNAME']             || @@username)
+        password             (ENV['OS_PASSWORD']             || @@password)
+        client_cert          (ENV['OS_CERT']                 || @@client_cert)
+        client_key           (ENV['OS_KEY']                  || @@client_key)
+        region_name          (ENV['OS_REGION_NAME']          || @@region_name)
+        identity_api_version (ENV['OS_IDENTITY_API_VERSION'] || @@identity_api_version)
+        user_domain_name     (ENV['OS_USER_DOMAIN_NAME']     || @@user_domain_name)
+        project_domain_name  (ENV['OS_PROJECT_DOMAIN_NAME']  || @@project_domain_name)
       end
     end
   end
 end