config.rb in kaname-0.8.1

- old
+ new

@@ -2,10 +2,11 @@
 require 'yaml'
 
 module Kaname
   class Config
     @@username = String.new
+    @@ca_cert = nil
     @@client_key = nil
     @@client_cert = nil
 
     def self.setup
       load_config unless envs_exist?
@@ -34,10 +35,11 @@
 
       @@auth_url             = config['auth_url']
       @@tenant               = config['tenant']
       @@username             = config['username']
       @@password             = config['password']
+      @@ca_cert              = config['ca_cert']
       @@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']
@@ -49,9 +51,10 @@
       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)
+        ca_cert              (ENV['OS_CACERT']               || @@ca_cert)
         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)