forj 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf55692c422122d563704df71be87e18427bcdf2
-  data.tar.gz: ffc9da6135f46720256dbabb3f8a9bf277a3d848
+  metadata.gz: 01a8a3f3825a0b5242367c3ff69a83675588800e
+  data.tar.gz: 2f78609c995ebf36be3f4becfc6b7bccbd3d42c4
 SHA512:
-  metadata.gz: 29d4e63ea42e92a8b2225a550146e692afd76b95911a1d74ae257e1c5823483473774b3e5d1e3049f02bb2f189dac8a35a1f8ec32d8a2d52f55aa7f99b19730d
-  data.tar.gz: 3a39d5dd6bed1d7cc75607e726625979a37dda94b59f337105b9479cf37228efff4bac5cd15442b1686b2e45fb5e815c18da326e82e7deaa4841f173fffc4dac
+  metadata.gz: f8bcda70764cf154d9762ac21f560965317d526c49e120f0469567ef8bd7238abc88638fd786bd5cb1e2bc539a3b4643f40f186c4e01de2bf1912cafc20f5f1d
+  data.tar.gz: cb6e149758f4111c93012df9f3fa6b4cecd865f408cf23ccca71d516685d630fdee6f57df4cf6a4d0f7169aeb73b6df2c8c4d58f9ce584432c8ec34737a8c435

data/README.md

@@ -83,16 +83,35 @@ Commands:
   forj help [action]                             # Describe available FORJ actions or one specific action
   forj setup                                     # set the credentials for forj cli
   forj show defaults                             # Show list of predefined value you can update in your ~/.forj/config.yaml
-  forj ssh 
+  forj ssh
 
 
-#### config.yaml description
+#### Configuration
 
-While building your forge, forj needs to load some data by default. Those are listed in forj-<version>/lib/defaults.yaml
+While building your forge, forj needs to load some data by default. Those are listed in the application.
 
-If you need to change one of this default value, update a ~/.forj/config.yaml file, with any kind of data that need to be changed.
+You can show them with :
 
-Here are the variables list you can set:
+    $ forj show defaults
+
+If you need to change one of them:
+
+    $ forj set "keypair_name=MyKeypairName"
+
+ex:
+    forj set keypair_name=nova
+
+You can check what kind of value, forj will use to boot/access your forge:
+
+    $ forj get -a dev
+
+
+#### Your config.yaml
+
+The following list gives you some details about keys/values required to boot/access your forge.
+
+
+~/.forj/config.yaml:
 
      default:
        account_name: name       # Default forj account used to connect to your cloud. This setting is automatically set to the first account created with forj setup <CloudProvider>
@@ -107,8 +126,8 @@ Here are the variables list you can set:
        ports: [Port1,Port2,...] # list of additional ports to add in your cloud security group.
                                 # This list is added to the default one in defaults.yaml
        keypair_path: path       # Define the file path to your OpenSSH private key. Useful to access your box with ssh command line.
-                                # By default. ~/.forj/keypairs/nova
-       keypair_name: name       # keypair name defined in your cloud to access your server. By default we named it 'nova'. If it doesn't exist, it will be created.
+                                # By default. ~/.ssh/forj-id_rsa
+       keypair_name: name       # keypair name defined in your cloud to access your server. By default we named it 'forj'. If it doesn't exist, it will be created.
        router: name             # Router name used by your forge boxes will use to access internet.
        security_group: name     # Security group name to configure and attach to each forge boxes.
        network: name            # Network name to attach to each forge boxes. By default we use 'private'. If it doesn't exist, it will be created.
@@ -143,12 +162,12 @@ Development installation:
 **Fedora/CentOS/Redhat rpm like package system**
 
     $ sudo yum install git gcc ruby-devel libxml2-devel rubygem-rspec libxslt-devel python-yaml rubygem-nokogiri -y
-    $ gem install rspec-rake rspec-mocks rspec-expectations 
+    $ gem install rspec-rake rspec-mocks rspec-expectations
 
 **Ubuntu/Debian deb like package system (not tested)**
 
     $ sudo apt-get install git ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
-    $ gem install rspec rspec-rake rspec-mocks rspec-expectations 
+    $ gem install rspec rspec-rake rspec-mocks rspec-expectations
 
 Then execute the following:
 

data/bin/forj

@@ -68,7 +68,7 @@ class Forj < Thor
 Quick steps: How to create a forj?
 ----------------------------------
 
-To test a forj blueprint, you will need an account on a cloud solution. 
+To test a forj blueprint, you will need an account on a cloud solution.
 Currently forj cli supports only HPHelion (https://horizon.hp.com) but will be expanded to support most of known clouds supported by FOG. (http://fog.io)
 
 1.  Setup your FORJ account.
@@ -91,26 +91,34 @@ forj command line details:
     end
   end
 
+   desc 'version', 'get GEM version of forj.'
+  
+   def version()
+      if Gem.loaded_specs['forj']
+         puts Gem.loaded_specs['forj'].version.to_s
+      end
+   end
+
+
 ################################# BOOT
-  desc 'boot <Blueprint> on <Provider> as <InstanceName> [options]', 'boot a Maestro box and instruct it to provision the blueprint'
+  desc 'boot <blueprint> <InstanceName> [options]', 'boot a Maestro box and instruct it to provision the blueprint'
 
   long_desc <<-LONGDESC
 This task boot a new forge with the following options
-\x5- blueprint : Is the name of the blueprint (currently cli only supports redstone)
+\x5- blueprint : Is the name of the blueprint
 \x5- InstanceName : name of the forge
 
-    Ex: forj boot redstone on hpcloud as maestro_test
+    Ex: forj boot redstone maestro_test -a dev
 
-`forj boot` load predefined forj values from `lib/defaults.yaml`. If you need to change one of them, add the key/value in your local config (-c or `~/.forj/config.yaml`).
-The list of predefined values can be retrieved with forj show defaults
+When `forj boot` starts, some variables are loaded. If you want to check/updated them, use `forj get [-a account]` 
 
   LONGDESC
 
-  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
-  method_option :maestro_repo,     :aliases => '-m',   :desc => "To use a different Maestro repository already cloned. 
-                                           By default, Maestro is systematically cloned to ~/.forj/maestro from github.
-                                           
-Following options superseed your config file or forj defaults."
+  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file.
+
+Following options superseed your Account, config file or forj defaults."
+  method_option :maestro_repo,     :aliases => '-m',   :desc => "config: maestro_repo  : To use a different Maestro repository already cloned.
+                                           By default, Maestro is systematically cloned to ~/.forj/maestro from github."
   method_option :infra,            :aliases => '-r',   :desc => 'config: infra_repo    : Defines your Infra directory to use while booting. You can also set FORJ_INFRA_DIR.'
   method_option :key_name,         :aliases => '-k',   :desc => "config: keypair_name  : Keypair name to use."
   method_option :key_path,         :aliases => '-p',   :desc => "config: keypair_path  : Private or Public key file to use."
@@ -122,15 +130,15 @@ Following options superseed your config file or forj defaults."
 Build system options:"
   method_option :boothook,         :aliases => '-H',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
   method_option :build,            :aliases => '-B',   :desc => 'Replace the default build.sh'
-  method_option :branch,           :aliases => '-R',   :desc => "Branch name to clone for maestro. 
+  method_option :branch,           :aliases => '-R',   :desc => "Branch name to clone for maestro.
 
 Maestro/infra bootstrap debugging:"
-  method_option :test_box,         :aliases => '-T',   :desc => "Identify a path to become your test-box repository. 
-                                           Ex: if your maestro is in ~/src/forj-oss, --test_box ~/src/forj-oss/maestro build.sh and 
+  method_option :test_box,         :aliases => '-T',   :desc => "Identify a path to become your test-box repository.
+                                           Ex: if your maestro is in ~/src/forj-oss, --test_box ~/src/forj-oss/maestro build.sh and
                                                test-box will send your local maestro repo to your box, for boot."
 
   def boot(blueprint, on_or_name, old_accountname = nil, as = nil, old_name = nil)
-  
+
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
 
@@ -142,30 +150,30 @@ Maestro/infra bootstrap debugging:"
          msg = "The syntax `forj boot '%s' on '%s' as '%s'` is depreciated.\nUse `forj boot '%s' '%s'" % [blueprint, old_accountname, old_name, blueprint, old_name]
          if oConfig.get('account_name') == old_accountname
             Logging.warning("%s` instead." % msg)
-         else   
+         else
             Logging.warning("%s -a '%s'` instead." % [msg, old_accountname])
          end
          name = old_name
-         oConfig.set('account_name', old_accountname)
+         oConfig.set(:account_name, old_accountname)
       else
          name = on_or_name
       end
 
-      Logging.fatal(1, "instance name '%s' not supported. Support only lower case, numeric and dash caracters." % [name]) if not /^[\d[[:lower:]]-]+$/ =~ name
+      Logging.fatal( 1, "instance name '%s' not supported. Support only lower case, numeric and dash caracters." % [name]) if not (/^[\d[[:lower:]]-]+$/ =~ name)
 
       # Options are added if they are set. Otherwise, get will retrieve the default value.
-      oConfig.set('account_name',   options[:account_name]) if options[:account_name]
-      oConfig.set('infra_repo',     options[:infra])
-      oConfig.set('keypair_name',   options[:key_name])
-      oConfig.set('keypair_path',   options[:key_path])
-      oConfig.set('security_group', options[:security_group])
-      oConfig.set('image',          options[:image])
-      oConfig.set('flavor',         options[:maestro_flavor])
-      oConfig.set('bp_flavor',      options[:bp_flavor])
-      oConfig.set(:maestro_repo ,   options[:maestro_repo])
+      oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
+      oConfig.set(:infra_repo,     options[:infra])
+      oConfig.set(:keypair_name,   options[:key_name])
+      oConfig.set(:keypair_path,   options[:key_path])
+      oConfig.set(:security_group, options[:security_group])
+      oConfig.set(:image,          options[:image])
+      oConfig.set(:flavor,         options[:maestro_flavor])
+      oConfig.set(:bp_flavor,      options[:bp_flavor])
+      oConfig.set(:maestro_repo ,  options[:maestro_repo])
       oConfig.set(:test_box, File.expand_path(options[:test_box])) if options[:test_box] and File.directory?(File.expand_path(options[:test_box]))
-      
-      
+
+
       if options[:key_path]
          mFound = options[:key_path].match(/^(.*)(\.pub)?$/)
          if mFound
@@ -173,75 +181,271 @@ Maestro/infra bootstrap debugging:"
             if mFound[2] and not File.exists?(File.expand_path(mFound[1]+mFound[2]))
                Logging.fatal(1, "'%s' is not a valid keypair files. At least the public key (.pub) is have to exist.")
             end
-            oConfig.set('keypair_path', key_path)
+            oConfig.set(:keypair_path, key_path)
          else
             Logging.fatal(1, "'%s' is not a valid keypair files. At least the public key (.pub) is have to exist.")
          end
       end
 
-      Boot.boot(blueprint, name, options[:build],
-                options[:build_config], options[:branch],
+      Boot.boot(blueprint, name, options[:build],options[:branch],
                 options[:boothook], options[:box_name], oConfig)
   end
 
 ################################# Show defaults
-   desc 'show defaults', 'Show list of predefined value you can update in your ~/.forj/config.yaml'
-   method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
+   desc 'show <Object> [name]', 'Show Object (default valuesr, account data, etc...) values.'
+  long_desc <<-LONGDESC
+This command helps to show values used by 'forj' to boot a blueprint (account data, default values, etc...)
 
-   def show(name)
-      case name
+queriable Objects:
+
+- defaults : Provide the list of predefined values, configured by forj, or by you in your ~/.forj/config.yaml (or another config file with -c)
+- account [name] : without name, forj will give you the list of account saved. Otherwise print 'name' account data.
+  LONGDESC
+
+   def show(object, name = nil)
+      case object
          when 'defaults'
             oConfig=ForjConfig.new()
-            oConfig.set('account_name',   options[:account_name])
-            oForjAccount = ForjAccount.new(oConfig)
-            oForjAccount.ac_load()
 
             puts 'List of default values: (local refer to your config file. hash refer to your FORJ account data)'
-            puts '-----------------------'
-            puts oConfig.default_dump([oForjAccount.hAccountData]).to_yaml
-            puts '-----------------------'
+            puts oConfig.default_dump().to_yaml
+            puts '---'
             puts "To change default values, update your ~/.forj/config.yaml and add the key/value entry under 'default' section."
+         when 'account'
+            oConfig=ForjConfig.new()
+            if not name
+               puts "List of FORJ accounts: Use 'forj account YourAccount' to see one account details."
+               oAccounts = ForjAccounts.new()
+               puts oAccounts.dump().to_yaml
+            else
+               oConfig.set(:account_name, name)
+               oAccount = ForjAccount.new(oConfig)
+               oAccount.ac_load()
+
+               puts "Account value for '%s':" % name
+               puts oAccount.dump().to_yaml
+               puts '---'
+               puts "To change those values, execute 'forj setup -a %s'." % options[:account_name]
+            end
+
          else
             Logging.error("object '%s' unknown." % name)
       end
    end
 
 ################################# DOWN
-  desc 'down', 'delete the Maestro box and all systems installed by the blueprint'
+   desc 'down <InstanceName>', 'delete the Maestro box and all systems installed by the blueprint'
+   long_desc <<-LONGDESC
+This action all servers that has been created under the instance name.
+
+Warning! This action don't removed any network/security groups cloud object.
+   LONGDESC
+
+   def down(name)
+      Logging.set_level(Logger::INFO) if options[:verbose]
+      Logging.set_level(Logger::DEBUG) if options[:debug]
+      oConfig = ForjConfig.new(options[:config])
+      oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
+
+      Down.down(oConfig, name)
+   end
+
+################################# SET
+  desc 'set [key=value] [options]', 'Set some variables in defaults or account.'
   long_desc <<-LONGDESC
-  Not yet implemented
+You can set some variables to change 'forj' defaults or specifically for a FORJ account.
+
+Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. During setup, if this keypair doesn't exist, it proposes to create it for you, with ssh-keygen.
+    If you want to use a keypair that already exists, you can set it as your default, with:
+
+    `forj set keypair_name=~/.ssh/id_rsa`
+
+    If you want to set this key only for your account 'dev':
+
+    `forj set keypair_name=~/.ssh/id_rsa -a dev`
+
+    If you want to get the list of possible key to set:
+
+    `forj set`
+
+    If you want to remove the key from dev, and ask for to re-use defaults (from your config or application default)
+
+    `forj set keypair_name= -a dev`
+
+    If you want to remove the key from your default, and re-use application default
+
+    `forj set keypair_name=`
+
   LONGDESC
 
-  def down(name)
+  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
+
+   def set(key_val = nil)
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
-      Down.down(name)
-  end
+
+      oConfig=ForjConfig.new()
+      if not key_val
+         puts "List of FORJ settings: Use 'forj set KeyName=Value [-a YourAccount]' to set one. Use `forj show defaults` / `account` to check values."
+         hMaps = oConfig.getAppDefault(:account_section_mapping)
+         hMaps.each_key { | key |
+            sDesc = rhGet(hMaps, key, :desc)
+            puts "%-15s : %s" % [key, sDesc]
+            }
+      else
+         mkey_val = key_val.match(/^(.*) *= *(.*)$/)
+         if mkey_val
+            if not options[:account_name]
+               if oConfig.exist?(mkey_val[1])
+                  sBef = "%s: '%s'" % [oConfig.exist?(mkey_val[1]), oConfig.get(mkey_val[1])]
+               else
+                  sBef = "unset"
+               end
+               if mkey_val[2] != ""
+                  oConfig.LocalSet(mkey_val[1], mkey_val[2])
+               else
+                  oConfig.LocalDel(mkey_val[1])
+               end
+               oConfig.SaveConfig()
+               if oConfig.exist?(mkey_val[1])
+                  sAft = "%s: '%s'" % [oConfig.exist?(mkey_val[1]), oConfig.get(mkey_val[1])]
+               else
+                  sAft = "unset"
+               end
+               puts "Updated:\n%s: %s => %s" % [mkey_val[1], sBef, sAft]
+            else
+               account_name = options[:account_name]
+               oConfig.set(:account_name, account_name)
+               oForjAccount = ForjAccount.new(oConfig)
+               oForjAccount.ac_load()
+               if oForjAccount.exist?(mkey_val[1])
+                  sBef = "%s: '%s'" % [oForjAccount.exist?(mkey_val[1]).sub("hash", account_name), oForjAccount.get(mkey_val[1])]
+               else
+                  sBef = "unset"
+               end
+               if mkey_val[2] == ""
+                  oForjAccount.del(mkey_val[1])
+               else
+                  oForjAccount.set(mkey_val[1], mkey_val[2])
+               end
+               oForjAccount.ac_save()
+               if oForjAccount.exist?(mkey_val[1])
+                  sAft = "%s: '%s'" % [oForjAccount.exist?(mkey_val[1]).sub("hash", account_name), oForjAccount.get(mkey_val[1])]
+               else
+                  sAft = "unset"
+               end
+               puts "Updated:\n%s: %s => %s" % [mkey_val[1], sBef, sAft]
+            end
+         else
+            Logging.fatal(1 ,"Syntax error. Please set your value like: 'key=value' and retry.")
+         end
+      end
+   end
+
+################################# GET
+  desc 'get', 'Get data from defaults or account values.'
+  long_desc <<-LONGDESC
+forj cli maintain a list of key/value at 3 Levels:
+\x5- Application defaults
+\x5- Local config defaults
+\x5- Account data
+
+This function will help you identify which value has been retrieved from which level.
+
+Ex: To get the default keypair_name, from your ~/.forj/config.yaml, or if not found, from application defaults.
+
+`forj get keypair_name`
+
+Ex: To get the keypair_name defined from the account, or from your ~/.forj/config.yaml, or if not found, from application defaults.
+
+`forj get keypair_name -a dev`
+
+
+  LONGDESC
+
+  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
+
+   def get(key = nil)
+      Logging.set_level(Logger::INFO) if options[:verbose]
+      Logging.set_level(Logger::DEBUG) if options[:debug]
+
+      oConfig=ForjConfig.new()
+      if not options[:account_name]
+         if key
+            if oConfig.exist?(key)
+               puts "%s:'%s'" % [oConfig.exist?(key), oConfig.get(key)]
+            else
+               Logging.message("key '%s' not found" % [key])
+            end
+         else
+            puts "legend: default = Application defaults, local = Local default config\n\n" % [options[:account_name], options[:account_name]]
+            puts "%-15s(%-7s) %-12s:\n--------------------------------------" % ['key', 'origin', 'section name']
+            hMaps = oConfig.getAppDefault(:account_section_mapping)
+            hMaps.each { |map_key, value|
+               if oConfig.exist?(map_key)
+                  puts "%-15s(%-7s) %-12s: '%s'" % [map_key, oConfig.exist?(map_key), value[:section], oConfig.get(map_key)]
+               else
+                  puts "%-15s(       ) %-12s: unset" % [map_key, value[:section]]
+               end
+
+               }
+         end
+         puts "\nUse 'forj set <key>=<value>' to update defaults"
+      else
+         oConfig.set(:account_name, options[:account_name])
+         oForjAccount = ForjAccount.new(oConfig)
+         Logging.fatal(1, "Unable to load account '%s'. Not found." % options[:account_name]) if not oForjAccount.ac_load
+         if key
+            if oForjAccount.exist?(key)
+               puts "%s: '%s'" % [oForjAccount.exist?(key).sub("hash", options[:account_name]), oForjAccount.get(key)]
+            elsif oForjAccount.exist?(key.parameterize.underscore.to_sym)
+               key_symb = key.parameterize.underscore.to_sym
+               puts "%s: '%s'" % [oForjAccount.exist?(key_symb).sub("hash", options[:account_name]), oForjAccount.get(key_symb)]
+            else
+               Logging.message("key '%s' not found"% [key])
+            end
+         else
+            puts "legend: default = Application defaults, local = Local default config, %s = '%s' account config\n\n" % [options[:account_name], options[:account_name]]
+            puts "%-15s(%-7s) %-12s:\n--------------------------------------" % ['key', 'origin', 'section name']
+            hMaps = oConfig.getAppDefault(:account_section_mapping)
+            hMaps.each { |map_key, value|
+               if oForjAccount.exist?(map_key)
+                  puts "%-15s(%-7s) %-12s: '%s'" % [map_key, oForjAccount.exist?(map_key).sub("hash", options[:account_name]), value[:section], oForjAccount.get(map_key)]
+               else
+                  puts "%-15s(       ) %12s: unset" % [map_key, value[:section]]
+               end
+               }
+         end
+         puts "\nUse 'forj set <key>=<value> -a %s' to update account data.\nOr  'forj set <key>= -a %s' to restore key default value." % [options[:account_name], options[:account_name]]
+      end
+   end
 
 ################################# SSH
-  desc 'ssh', 'connect to your forge thru ssh'
+  desc 'ssh <Instance> <Server> [options]', 'connect to your forge thru ssh'
   long_desc <<-LONGDESC
-Connect through ssh to an existing instance
+Connect through ssh to a node attached to an instance
 
-        not yet implemented
+ex: forj ssh myforge review
   LONGDESC
 
   def ssh(name, server)
     Logging.set_level(Logger::INFO) if options[:verbose]
     Logging.set_level(Logger::DEBUG) if options[:debug]
-    Ssh.connect(name, server)
+   oConfig = ForjConfig.new(options[:config])
+   oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
+    Ssh.connect(name, server, oConfig)
   end
 
 ################################# SETUP
   method_option :keypair_name,         :aliases => '-k',   :desc => "config keypair_name : Keypair name attached as default to your FORJ account."
-  method_option :keypair_path,         :aliases => '-p',   :desc => "config keypair_path : SSH key file (private or public) to attach as default to your FORJ account. 
-                                       It will attach any detected private/public key thanks to the file name 
+  method_option :keypair_path,         :aliases => '-p',   :desc => "config keypair_path : SSH key file (private or public) to attach as default to your FORJ account.
+                                       It will attach any detected private/public key thanks to the file name
                                        (without extension/.pem = private, .pub = public)"
 
   desc 'setup [AccountName [Provider]] [options]', "Setup FORJ cloud account credentials and information."
   long_desc <<-LONGDESC
 This setup will configure a FORJ account used to connect to your cloud system.
-\x5It will ask for your cloud provider credentials and services. 
+\x5It will ask for your cloud provider credentials and services.
 
 If AccountName is not set, 'hpcloud' will be used for AccountName and provider name, by default.
 \x5If AccountName is not set without provider, 'hpcloud' provider will be used, by default.
@@ -252,16 +456,16 @@ Several data will be requested like:
 \x5- Cloud provider credentials and services.
 \x5- user/password (password is encrypted)
 \x5- DNS settings if you want Maestro to manage it.
-\x5- domain name to add to each boxes hostname 
+\x5- domain name to add to each boxes hostname
   LONGDESC
   def setup(sAccountName = 'hpcloud', sProvider = "hpcloud")
     Logging.set_level(Logger::INFO)  if options[:verbose]
     Logging.set_level(Logger::DEBUG) if options[:debug]
     oConfig=ForjConfig.new(options[:config])
-    oConfig.set('provider', sProvider)
-    oConfig.set('account_name', sAccountName)
-    oConfig.set('keypair_path', options[:keypair_path]) if options[:keypair_path]
-    oConfig.set('keypair_name', options[:keypair_name]) if options[:keypair_name]
+    oConfig.set(:provider, sProvider)
+    oConfig.set(:account_name, sAccountName)
+    oConfig.set(:keypair_path, options[:keypair_path]) if options[:keypair_path]
+    oConfig.set(:keypair_name, options[:keypair_name]) if options[:keypair_name]
     Setup.setup(oConfig)
   end