forj 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce94bcc25e62cfda68553083ab01c6f9dddd210
-  data.tar.gz: 6f98bdd389ac9e930225075145e2aeac9680b280
+  metadata.gz: 109aaca45df11251c58c7dc0a609e70b8f00464c
+  data.tar.gz: b1e2012cbc1e679e2aa3d15a009090ddb6082b7e
 SHA512:
-  metadata.gz: 10cf1c72bc894a6db47de88fbeead1f64a5d429f26fc8e6f69f382e5ffc4377d2d7c86976768a4dfb9262a04c5c7861a87c2078c43c4b2222fbf7af32e312406
-  data.tar.gz: 40272628a7797e2eccaa90daba1b57e81049db3f1381ce1bd7dc84395d6d460d06d23f0f4d1861fe98fbb40781c932137226840cb78f3dff90f46e79b89530fb
+  metadata.gz: 184323727e5d66392e42d3f9a350e2dee1aad85949e0261cb6fc8e4f211209193fd61674dafcda7d12573cd93b27de76ef68ad8c0075e7726049c7120033c3ba
+  data.tar.gz: 75236938deada281404745ca1bda29cd5c19f432f2c20dba20851837864b0d453bee63b968d410fa294685f6143653ad0efa643e23c50d267fb3e9a2bc081ae4

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 pkg/
 *.swp
 .geanyprj
+.vagrant

data/README.md

@@ -45,6 +45,14 @@ Perform one of the ruby installation steps without `gem install forj`.
     $ bundle install --gemfile Gemfile
     $ rake install
 
+**For all OS including Linux/windows/mac
+2 vagrant images has been written.
+Read [vagrant/README.md] for details.
+
+This solution helps to develop and test on forj and lorj
+
+For more information about lorj, a process/controller library, see https://github.com/forj-oss/lorj
+
 Quick steps: How to create a forj?
 ----------------------------------
 
@@ -52,11 +60,31 @@ Quick steps: How to create a forj?
 
 1.  Setup your first forj account.
 
-    `$ forj setup [AccountName]`
+    `$ forj setup [AccountName [provider]]`
 
     Ex: `forj setup MyAccount`. In this example, your account will be named 'MyAccount'.
          The first time you setup your account, it will become the default one.
-    **WARNING!!!** [Provider] is currently not supported. By default, it is using hpcloud as default provider.
+
+    Supported provider: **hpcloud**, **openstack**. hpcloud is the default.
+
+    If you uses hphelion as a provider, check the API authentication system to select hpcloud or openstack.
+
+    - *hpcloud* : Use this provider for http://www.hpcloud.com/, or hphelion.
+      Uses Access key and secret key authentication mechanism.
+
+        - [hp public cloud|http://www.hpcloud.com/] from HP. Tested successfully.
+
+    - *openstack*: Use this provider to access any openstack installation (public or private) or Hphelion (public or private)
+        Uses login and password authentication system
+
+        If you want to test against a new local openstack cloud, you can consider :
+
+        - [packstack|https://wiki.openstack.org/wiki/Packstack] from RedHat. Can be used for a notebook local installation. tested successfully.
+        - [hphelion|http://www8.hp.com/fr/fr/cloud/helion-overview.html] from HP. Tested successfully
+        - [Ubuntu OpenStack|http://www.ubuntu.com/cloud] from Canonical. Not tested.
+
+    For any other cloud, you need a provider in lorj library. Contribute to create a new provider!
+    See
 
 2.  Create your forge on your default account
 
@@ -64,6 +92,12 @@ Quick steps: How to create a forj?
 
     Ex: `forj boot redstone myforge` - This command will start a Redstone forge named 'myforge' with the default FORJ account. Previous, we set it to be MyAccount.
 
+NOTE: If you are creating a Forge in a corporate network, a proxy may be required for Maestro to access internet.
+You can ask `forj` cli to send the proxy to use with -e
+
+Ex: Thanks to a CorporateAccount setup with forj setup, the following will use it and set the webproxy metadata.
+
+    `forj boot redstone myforge -a CorporateAccount -e webproxy=$http_proxy`
 
 ###Forj options:
 

data/bin/forj

@@ -227,6 +227,10 @@ Warning! This action do not remove any network/security groups cloud object.
 
   method_option :force, :aliases => '-f', :desc => 'force deletion of all' \
     ' servers for the given InstanceName'
+  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.' + "\n\n" + 'Following options superseed your' \
+     ' Account, config file or forj defaults.'
   def destroy(name)
     require 'destroy.rb'
     Forj::Settings.common_options(options)

data/forj.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name        = 'forj'
   s.homepage = 'https://www.forj.io'
 
-  s.version     = '1.0.5'
-  s.date        = '2015-02-11'
+  s.version     = '1.0.6'
+  s.date        = '2015-03-18'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -52,10 +52,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '1.7.5'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'nokogiri','1.5.11'
-  s.add_runtime_dependency 'lorj', '~> 1.0.2'
+  s.add_runtime_dependency 'lorj', '~> 1.0.6'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"
+  s.add_development_dependency "rubocop", ">=0.29.0"
   s.rdoc_options << '--title' << 'Lorj - The Process Controllers framework system' <<
   '--main' << 'README.md'
 end

data/forj/defaults.yaml

@@ -30,10 +30,6 @@
   :security_group: forj
   :ports: [22, 80, 443, 3000, 3131-3135, 4505-4506, 5000, 5666, 8000, 8080-8081, 8083, 8125, 8139-8140, 8773-8776, 9292, 29418, 35357]
 
-  # Private key file path. Those files (private/public key) will be added to ~/.forj/keypairs/ as respectively 'keypair_name' and 'keypair_name'.pub
-  :keypair_files: ~/.ssh/forj-id_rsa
-  :keypair_name: forj
-
   # Network: If network doesn't exist, forj cli will try to create it, and attach it a router.
   :network: forj
 
@@ -127,7 +123,7 @@
 
          If the keypair doesn't exist locally, it will be created for you.
       :desc:               "Base keypair file name"
-      :default_value:      "~/.ssh/id_rsa-forj"
+      :default_value:      "~/.ssh/<%= config[:keypair_name] %>-id_rsa"
       :validate_function:  :forj_check_keypairs_files
       :account:            true
       :ask_step:           2
@@ -137,7 +133,7 @@
       :desc:               "Forj internal copy of private and public key pair files "
     :keypair_name:
       :desc:               "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."
-      :validate:           !ruby/regexp /^\w?\w*$/
+      :required:           true
       :default_value:      "forj"
       :account:            true
       :ask_step:           2
@@ -157,8 +153,9 @@
       :account_exclusive:  true
       :account:            true
       :required:           true
+      :encrypted:          true
     :tenant:
-      :desc:               "Openstack Tenant ID"
+      :desc:               "Openstack Tenant Name (Project name)"
       :account_exclusive:  true
       :account:            true
       :required:           true
@@ -170,6 +167,7 @@
       :required:           true
       :validate:           !ruby/regexp /\w+/
       :ask_step:           1
+      :default_value:      "<%= (config[:provider_name] == 'openstack')?config[:account_id]:nil %>"
     :os_enckey:
       :desc:               "Openstack compute cloud password"
       :account_exclusive:  true
@@ -177,6 +175,7 @@
       :account:            true
       :required:           true
       :ask_step:           1
+      :default_value:      "<%= (config[:provider_name] == 'openstack')?config[:account_key]:nil %>"
 
   # Defines DNS services for maestro
   :dns:
@@ -206,11 +205,12 @@
       :validate:        !ruby/regexp /^\w?[\w_-]*$/
       :ask_step:        1
       :ask_sort:        0
+      :default_value:   "<%= (config[:provider_name] == 'openstack')?config[:tenant]:nil %>"
     :network_name:
       :desc:            "Network name to attach to each forge boxes. By default we use 'forj'. If it doesn't exist, it will be created."
       :default:         network
       :account:         true
-      :validate:        !ruby/regexp /^\w?\w*$/
+      :required:        true
       :default_value:   "forj"
       :ask_step:        2
     :security_group:
@@ -228,7 +228,10 @@
     :build_config:
       :desc:       "forj cli use 'build.sh' to create Maestro. See build_config option on build.sh to get more information. By default 'box'"
     :bp_flavor:
-      :desc:       "Blueprint nodes default flavor. Usually, blueprint node are smaller than Maestro."
+      :desc:       "Blueprint nodes default flavor"
+      :explanation: |-
+        Blueprint usually defines the required flavor for their nodes. If not, it will use this flavor as default.
+        Usually, blueprint nodes are smaller than Maestro.
       :account:    true
       :list_values:
          :query_type:   :query_call # Will execute a query on flavor, query_params is empty for all.
@@ -237,7 +240,8 @@
          :validate:     :list_strict
       :ask_step:        2
     :flavor_name:
-      :desc:       "Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs."
+      :explanation: 'This flavor is for Maestro only.'
+      :desc:       "Maestro Flavor name"
       :default:    :flavor
       :account:    true
       :list_values:
@@ -247,7 +251,10 @@
          :validate:     :list_strict
       :ask_step:        2
     :image_name:
-      :desc:       "Ubuntu image used to create Maestro and all forge boxes. By default, it is 'Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)'"
+      :desc:       "Image name"
+      :explanation: |-
+        Ubuntu image used to create Maestro and all forge boxes. Originally, Maestro uses 'Ubuntu Precise 12.04.4 LTS Server 64-bit'.
+        You need to choose the appropriate image to make Maestro & boxes to boot normally.
       :account:    true
       :ask_step:        2
       :list_values:
@@ -267,13 +274,12 @@
         Checking image '<%= config[:image_name] %>'...
       :account:     true
       :ask_step:    2
+      :after:              :image_name
       :list_values:
-        :query_type:  :process_call # Will execute a query on image and return the list of images.
-        :query_call:  :setup_ssh_user
-        :query_params:
-          :image_name: lorj::config[:image_name]
-        :object:      :image
-        :value:       :name
+        :query_type:  :process_call # Will execute a process to query on image
+        :query_call:  :setup_ssh_user # and return the list of images and a default value.
+        :query_params: # Transmitted as hParams
+          :image_name: '<%= config[:image_name] %>'
     :ports:
       :desc:            "List of security group rules (1 port or range of ports) to open to the external network."
     :branch:

data/lib/forj-settings.rb

@@ -93,19 +93,19 @@ module Forj
       s_bef = format(
         "'%s' (%s)",
         old_value,
-        account.exist?(key_to_set)
+        account.where?(key_to_set)[0]
       ) if account.exist?(key_to_set)
 
       s_bef
     end
 
-    def self.format_new_key(_o_forj_account, key_to_set)
+    def self.format_new_key(account, key_to_set)
       s_aft = 'unset'
 
       s_aft = format(
         "'%s' (%s)",
         account.get(key_to_set),
-        account.exist?(key_to_set)
+        account.where?(key_to_set)[0]
       ) if account.exist?(key_to_set)
 
       s_aft
@@ -131,7 +131,7 @@ module Forj
 
         full_key = format(
           '%s/%s',
-          Lorj::Default.get_meta_auto(key_to_set),
+          Lorj.data.first_section(key_to_set),
           key_to_set
         )
 
@@ -145,9 +145,9 @@ module Forj
         b_dirty = true
 
         if key_value == ''
-          config.del(key_to_set)
+          config.del(key_to_set, :name => 'account')
         else
-          config.set(key_to_set, key_value)
+          config.set(key_to_set, key_value, :name => 'account')
         end
 
         s_aft = format_new_key(config, key_to_set)

data/lib/forj/ForjCore.rb

@@ -104,5 +104,7 @@ class Lorj::BaseDefinition
 
   obj_needs_optional
   obj_needs :CloudObject,  :server
+  obj_needs :CloudObject,  :public_ip,        :for => [:create_e]
+  obj_needs :CloudObject,  :keypairs,         :for => [:create_e]
   obj_needs :data,         :blueprint
 end

data/lib/forj/process/ForjProcess.rb

@@ -33,9 +33,9 @@ class ForjCoreProcess
   def build_forge(sObjectType, hParams)
     forge_exist?(sObjectType)
 
-    o_server = data_objects(:server, :ObjectData)
+    o_server = hParams.refresh[:server, :ObjectData]
 
-    boot_options = boot_keypairs(o_server)
+    boot_options = boot_keypairs(hParams)
 
     # Define the log lines to get and test.
     config.set(:log_lines, 5)
@@ -47,7 +47,7 @@ class ForjCoreProcess
     s_status = :checking
     maestro_create_status(s_status)
 
-    o_address = data_objects(:public_ip, :ObjectData)
+    o_address = hParams.refresh[:public_ip, :ObjectData]
 
     s_status = active_server?(o_server, o_address, boot_options[:keys],
                               boot_options[:coherent], s_status
@@ -57,7 +57,7 @@ class ForjCoreProcess
 
     o_forge = get_forge(sObjectType, config[:instance_name], hParams)
 
-    read_blueprint_implemented(o_forge, o_address)
+    read_blueprint_implemented(o_forge, hParams)
     o_forge
   end
 
@@ -93,27 +93,17 @@ class ForjCoreProcess
     end
   end
 
-  def boot_keypairs(o_server)
-    # Get keypairs
-    h_keys = keypair_detect(
-      o_server[:key_name],
-      File.join(Forj.keypairs_path, o_server[:key_name])
-    )
-
-    private_key_file = File.join(
-      h_keys[:keypair_path],
-      h_keys[:private_key_name]
-    )
-    # public_key_file  = File.join(
-    #     h_keys[:keypair_path],
-    #     h_keys[:public_key_name]
-    # )
+  def boot_keypairs(params)
+    o_server = params[:server, :ObjectData]
+    h_keys = params[:keypairs]
 
-    o_server_key = process_get(:keypairs, o_server[:key_name])
+    if h_keys.nil? || o_server[:key_name] != h_keys[:name]
+      h_keys = process_get(:keypairs, o_server[:key_name])
+    end
+    private_key_file = File.join(h_keys[:keypair_path],
+                                 h_keys[:private_key_name])
 
-    keypair_coherent = coherent_keypair?(h_keys, o_server_key)
-    boot_options = { :keys => private_key_file, :coherent => keypair_coherent }
-    boot_options
+    { :keys => private_key_file, :coherent => h_keys[:coherent] }
   end
 
   def active_server?(o_server, o_address, private_key_file,
@@ -158,12 +148,14 @@ end
 # Functions for boot - build_forge
 class ForjCoreProcess
   # rubocop:disable CyclomaticComplexity
-  def maestro_create_status(sStatus, iCurAct = 4)
+
+  def maestro_create_status(sStatus, iCurAct = 4, pending_count = 0)
     s_activity = '/-\\|?'
     if iCurAct < 4
       s_cur_act = 'ACTIVE'
     else
-      s_cur_act = ANSI.bold('PENDING')
+      s_cur_act = format('%s - %d s', ANSI.bold('PENDING'),
+                         (pending_count + 1) * 5)
     end
 
     case sStatus
@@ -186,15 +178,24 @@ class ForjCoreProcess
       PrcLib.info('Server is active')
     end
   end
-  # rubocop:enable CyclomaticComplexity
+
+  # TODO: Rewrite this function to break it for rubocop.
+  # rubocop: disable PerceivedComplexity
+  # rubocop: disable Metrics/MethodLength
 
   def till_server_active(s_status, o_server, o_address, boot_options)
     m_cloud_init_error = []
     i_cur_act = 0
     o_old_log = ''
+    pending_count = 0
 
     while s_status != :active
-      maestro_create_status(s_status, i_cur_act)
+      if i_cur_act == 4
+        pending_count += 1
+      else
+        pending_count = 0
+      end
+      maestro_create_status(s_status, i_cur_act, pending_count)
       i_cur_act += 1
       i_cur_act = i_cur_act % 4
       o_server = load_server(o_server)
@@ -212,11 +213,44 @@ class ForjCoreProcess
         m_cloud_init_error = output_options[:error]
         o_old_log = output_options[:old_log]
         i_cur_act = output_options[:cur_act]
+        if pending_count == 60
+          image = server_get_image o_server
+          highlight = ANSI.yellow('-' * 40)
+          PrcLib.warning("No more server activity detected.\n"\
+                         "#{highlight}\n"\
+                         "%s\n"\
+                         "#{highlight}\n"\
+                         "The server '%s' is not providing any output log for"\
+                         " more than 5 minutes.\nPlease review the current"\
+                         'output show below to determine if this a normal '\
+                         "situation.\nYou can connect to the server if you "\
+                         "want to.\nTo connect, use:\n"\
+                         'ssh %s@%s -o StrictHostKeyChecking=no -i %s',
+                         o_old_log, o_server[:name], image[:ssh_user],
+                         o_address[:public_ip], boot_options[:keys])
+        end
       end
       sleep(5) if s_status != :active
     end
   end
 
+  # Function to get the image data from the server
+  #
+
+  def server_get_image(server)
+    image = data_objects(:image, :ObjectData)
+    return image unless image.nil?
+
+    image = process_get(:image, server[:image_id])
+
+    return Lorj::Data.new if image.nil?
+
+    register(image)
+  end
+
+  # rubocop:enable CyclomaticComplexity
+  # rubocop:enable PerceivedComplexity
+
   # Function to get the server, tracking errors
   #
   # *return*
@@ -227,8 +261,10 @@ class ForjCoreProcess
       found_server = process_get(:server, server[:attrs][:id])
     rescue => e
       PrcLib.error(e.message)
+    else
+      return found_server
     end
-    (found_server.nil? ? server : found_server)
+    server
   end
 end
 
@@ -246,17 +282,19 @@ class ForjCoreProcess
         o_address = o_addresses[0]
       end
     end
+
+    image = data_objects[:image, :ObjectData]
     s_msg = <<-END
 Public IP for server '%s' is assigned.
 Now, as soon as the server respond to the ssh port,
 you will be able to get a tail of the build with:
 while [ 1 = 1 ]
 do
- ssh ubuntu@%s -o StrictHostKeyChecking=no -i %s tail -f /var/log/cloud-init.log
+ ssh %s@%s -o StrictHostKeyChecking=no -i %s tail -f /var/log/cloud-init.log
  sleep 5
 done
     END
-    s_msg = format(s_msg, o_server[:name],
+    s_msg = format(s_msg, o_server[:name], image[:user],
                    o_address[:public_ip], boot_options[:keys]
     )
     unless boot_options[:coherent]
@@ -271,28 +309,26 @@ done
   end
 
   def analyze_log_output(output_options, s_status)
-    # m_cloud_init_error = []
-    # o_old_log = ''
-    o_log = process_get(:server_log, 25)[:attrs][:output]
-    # i_cur_act = 4 if o_log == o_old_log
-    output_options[:cur_act] = 4 if o_log == output_options[:old_log]
-    # o_old_log = o_log
-    output_options[:old_log] = o_log
-    if /cloud-init boot finished/ =~ o_log
-      # s_status = :active
+    o_log = process_get(:server_log, 25)
+    return output_options if o_log.nil? || o_log.empty?
+
+    log = o_log[:attrs][:output]
+    output_options[:cur_act] = 4 if log == output_options[:old_log]
+    output_options[:old_log] = log
+    if /cloud-init boot finished/ =~ log
       output_options[:status] = :active
       output_options[:error] = display_boot_moving_error(
         output_options[:error]
       )
-    elsif /\[CRITICAL\]/ =~ o_log
-      m_critical = o_log.scan(/.*\[CRITICAL\].*\n/)
+    elsif /\[CRITICAL\]/ =~ log
+      m_critical = log.scan(/.*\[CRITICAL\].*\n/)
       output_options[:error] = display_boot_critical_error(
         output_options[:error],
         m_critical
       )
     else
       # validate server status
-      output_options = analyze_server_status(s_status, o_log, output_options)
+      output_options = analyze_server_status(s_status, log, output_options)
     end
     output_options
   end
@@ -348,19 +384,22 @@ class ForjCoreProcess
     output_options
   end
 
-  def read_blueprint_implemented(o_forge, o_address)
+  def read_blueprint_implemented(o_forge, params)
+    o_address = params[:public_ip, :ObjectData]
+    blueprint = params[:blueprint]
+    instance_name = params[:instance_name]
     s_msg = format(
       "Your Forge '%s' is ready and accessible from" \
       " IP #{o_address[:public_ip]}.",
-      config[:instance_name]
+      instance_name
     )
     # TODO: read the blueprint/layout to identify which services
     # are implemented and can be accessible.
-    if config[:blueprint]
+    if blueprint
       s_msg += format(
         "\n" + 'Maestro has implemented the following server(s) for your' \
           " blueprint '%s':",
-        config[:blueprint]
+        blueprint
       )
       server_options = display_servers_with_ip(o_forge, s_msg)
       s_msg += server_options[:message]
@@ -369,13 +408,8 @@ class ForjCoreProcess
         s_msg += format("\n%d server(s) identified.\n", i_count)
       else
         s_msg = 'No servers found except maestro'
-        PrcLib.warning(
-          format(
-            'Something went wrong, while creating nodes for blueprint' \
-              " '%s'. check maestro logs.",
-            config[:blueprint]
-          )
-        )
+        PrcLib.warning('Something went wrong, while creating nodes for '\
+                       "blueprint '%s'. check maestro logs.", blueprint)
       end
     else
       s_msg += "\nMaestro has NOT implemented any servers, because you did" \
@@ -861,7 +895,7 @@ class ForjCoreProcess
     if PrcLib.core_level < 5
       File.delete(mime)
     else
-      ForjLib.debug(5, "user_data temp file '%s' kept", mime)
+      Lorj.debug(5, "user_data temp file '%s' kept", mime)
     end
 
     config[:user_data] = user_data
@@ -935,45 +969,24 @@ class ForjCoreProcess
 
   def create_keys_automatically(keys, private_key_file)
     return if keys[:private_key_exist?]
-    # Need to create a key. ask if we need so.
-    PrcLib.message("The private key file attached to keypair named '%s' is not"\
-                   ' found. Running ssh-keygen to create it.',
-                   keys[:keypair_name])
     unless File.exist?(private_key_file)
+      # Need to create a key. ask if we need so.
+      PrcLib.message("The private key file attached to keypair named '%s' is "\
+                     'not found. Running ssh-keygen to create it.',
+                     keys[:keypair_name])
       PrcLib.ensure_dir_exists(File.dirname(private_key_file))
       command = format('ssh-keygen -t rsa -f %s', private_key_file)
       PrcLib.debug(format("Executing '%s'", command))
       system(command)
     end
-    if !File.exist?(private_key_file)
-      PrcLib.fatal(1, "'%s' not found. Unable to add your keypair to hpcloud."\
-                   ' Create it yourself and provide it with -p option. '\
-                   'Then retry.', private_key_file)
-    else
-      PrcLib.fatal(1, 'ssh-keygen did not created your key pairs. Aborting.'\
+    return if File.exist?(private_key_file)
+    PrcLib.fatal(1, 'ssh-keygen did not created your key pairs. Aborting.'\
                    ' Please review errors in ~/.forj/forj.log')
-    end
   end
 end
 
 # Functions for setup
 class ForjCoreProcess
-  def load_key_with_passphrase(keys, public_key_file, private_key_file)
-    # unless keys[:public_key_exist?]
-    return if keys[:private_key_exist?]
-    PrcLib.message("Your public key '%s' was not found. Getting it from the" \
-                   ' private one. It may require your passphrase.',
-                   public_key_file)
-    command = format(
-      'ssh-keygen -y -f %s > %s',
-      private_key_file,
-      public_key_file
-    )
-    PrcLib.debug("Executing '%s'", command)
-    system(command)
-    # end
-  end
-
   def save_sequences(private_key_file, forj_private_key_file,
                      public_key_file, forj_public_key_file, key_name
   )
@@ -981,8 +994,8 @@ class ForjCoreProcess
     FileUtils.copy(private_key_file, forj_private_key_file)
     FileUtils.copy(public_key_file, forj_public_key_file)
     # Attaching this keypair to the account
-    @hAccountData.rh_set(key_name, :credentials, 'keypair_name')
-    @hAccountData.rh_set(forj_private_key_file, :credentials, 'keypair_path')
+    config.set(:keypair_name, key_name, :name => 'account')
+    config.set(:keypair_path, forj_private_key_file, :name => 'account')
     config.local_set(key_name.to_s, private_key_file, :imported_keys)
   end
 
@@ -1015,7 +1028,7 @@ end
 class ForjCoreProcess
   def save_internal_key(forj_private_key_file, keys)
     # Saving internal copy of private key file for forj use.
-    config.set(:keypair_path, forj_private_key_file)
+    config.set(:keypair_path, forj_private_key_file, :name => 'account')
     PrcLib.info("Configured forj keypair '%s' with '%s'",
                 keys[:keypair_name],
                 File.join(keys[:keypair_path], keys[:key_basename])
@@ -1043,10 +1056,8 @@ class ForjCoreProcess
     # Creation sequences
     create_keys_automatically(keys, private_key_file)
 
-    load_key_with_passphrase(keys, public_key_file, private_key_file)
-
     forj_private_key_file = File.join(Forj.keypairs_path, key_name)
-    # forj_public_key_file = File.join($FORJ_KEYPAIRS_PATH, key_name + '.pub')
+    forj_public_key_file = File.join(Forj.keypairs_path, key_name + '.pub')
 
     # Saving sequences
     if keys[:keypair_path] != Forj.keypairs_path
@@ -1068,7 +1079,7 @@ class ForjCoreProcess
 
   def forj_dns_settings
     s_ask = 'Optionally, you can ask Maestro to use/manage a domain name on' \
-      " your cloud. It requires your DNS cloud service to be enabled.\nDo " \
+      " your cloud. It requires your DNS cloud service to be enabled.\nDo" \
       ' you want to configure it?'
     config.set(:dns_settings, agree(s_ask))
     true
@@ -1077,7 +1088,8 @@ class ForjCoreProcess
   def forj_dns_settings?(sKey)
     # Return true to ask the question. false otherwise
     unless config.get(:dns_settings)
-      config.set(sKey, nil)
+      section = Lorj.data.first_section(sKey)
+      config.del(sKey, :name => 'account', :section => section)
       return false # Do not ask
     end
     true
@@ -1272,17 +1284,11 @@ end
 class ForjCoreProcess
   def setup_ssh_user(_sCloudObj, hParams)
     images  = process_query(:image,  :name => hParams[:image_name])
-    case images.length
-    when 0
-      s_default = hParams[:default_value]
-    else
-      if images[0, :ssh_user].nil?
-        s_default = hParams[:default_value]
-      else
-        s_default = images[0, :ssh_user]
-      end
+    result = { :list => config[:users] }
+    if images.length >= 1 && !images[0, :ssh_user].nil?
+      result[:default_value] = images[0, :ssh_user]
     end
-    { :default_value => s_default, :list => config[:users] }
+    result
   end
 
   def ssh_login(options, user, public_ip)

data/vagrant/README.md

@@ -0,0 +1,51 @@
+You can test forj cli (and lorj as well) from any OS, like linux/windows or mac thanks to vagrant.
+
+There is 2 differents implementations of forj cli working on fedora or ubuntu.
+
+Choose the one you want.
+
+To test forj cli, do the following:
+
+1. install [virtualbox | https://www.virtualbox.org/wiki/Downloads] or vmware workstation
+
+2. install [vagrant|https://www.vagrantup.com/]
+
+3. clone the forj repository.
+
+    $ `git clone https://review.forj.io/forj-oss/forj`
+
+4. run vagrant up
+
+    $ `cd forj/vagrant/fedora`
+
+    $ `vagrant up`
+
+If you want to test both forj and lorj from source, use this different way:
+For more information about lorj, a process/controller library, see https://github.com/forj-oss/lorj
+
+3. clone the forj and lorj repository.
+
+    $ `git clone https://review.forj.io/forj-oss/forj`
+    $ `git clone https://review.forj.io/forj-oss/lorj`
+
+4. run vagrant up
+
+    $ `cd forj/vagrant/fedora`
+    $ `lorj_src=../lorj vagrant up`
+
+Now you are in, under fedora in this example, and forj cli installed from source.
+You are in a linux environment, where you can do anything you need.
+
+
+Example use cases:
+
+- you want to install the latest forj cli package
+
+    sudo gem uninstall forj
+    sudo gem install forj
+
+- You want to test an update in forj
+
+    1. update your code under your host, on in vagrant, /srv/forj/...
+    2. update the installation with sources. This will execute rubocop and rspec, before any install.
+    sudo /srv/forj/vagrant/configure/install.sh

data/vagrant/configure/install.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#
+ echo export GIT_SSL_NO_VERIFY=1 >> ~/.bashrc
+ . ~/.bashrc
+
+for PRJ in lorj forj
+do
+  if [ -d /srv/$PRJ ]
+  then
+     cd /srv/$PRJ
+     bundle install --gemfile Gemfile
+     rake install
+     cd -
+  fi
+done
+

data/vagrant/fedora/Vagrantfile

@@ -0,0 +1,95 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+
+
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "hansode/fedora-21-server-x86_64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder "../../", "/srv/forj"
+
+  lorj = false
+  if ENV.key?('lorj_src') 
+    lorj_src = File.expand_path(ENV['lorj_src'])
+    git_data = File.join(lorj_src, '.git', 'config')
+    if File.exist?(git_data) && open(git_data) { |f| f.grep(/forj-oss\/lorj/) }
+      config.vm.synced_folder ENV['lorj_src'], "/srv/lorj"
+      lorj=true
+    end
+  end
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline <<-SHELL
+  #   sudo apt-get install apache2
+  # SHELL
+  if Vagrant.has_plugin?("vagrant-proxyconf")
+    config.proxy.http     = ENV['http_proxy'] if ENV.key?('http_proxy')
+    config.proxy.https    = ENV['https_proxy'] if ENV.key?('https_proxy')
+    config.proxy.no_proxy = ENV['no_proxy'] if ENV.key?('no_proxy')
+  end
+  priv = { privileged: true }
+  config.vm.provision "shell", priv.merge(inline: "yum install ruby-devel libxml2-devel libxslt-devel python-yaml gcc git -y")
+  config.vm.provision "shell", inline: "gem install bundler --no-rdoc --no-ri"
+  config.vm.provision "shell", inline: "gem install rake --no-rdoc --no-ri"
+  config.vm.provision "shell", inline: "echo 'PATH=$PATH:/usr/local/bin' >> /etc/profile.d/local.sh"
+  config.vm.provision "shell", inline: "/srv/forj/vagrant/configure/install.sh"
+  config.vm.provision "shell", inline: "echo \"echo 'Call sudo /srv/forj/vagrant/configure/install.sh to reinstall forj/lorj from source'\" >> ~vagrant/.bash_profile"
+end

data/vagrant/ubuntu/Vagrantfile

@@ -0,0 +1,90 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ubuntu/trusty64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder "../../", "/srv/forj"
+
+  if ENV.key?('lorj_src') 
+    lorj_src = File.expand_path(ENV['lorj_src'])
+    git_data = File.join(lorj_src, '.git', 'config')
+    if File.exist?(git_data) && open(git_data) { |f| f.grep(/forj-oss\/lorj/) }
+      config.vm.synced_folder ENV['lorj_src'], "/srv/lorj"
+    end
+  end
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline <<-SHELL
+  #   sudo apt-get install apache2
+  # SHELL
+  if Vagrant.has_plugin?("vagrant-proxyconf")
+    config.proxy.http     = ENV['http_proxy'] if ENV.key?('http_proxy')
+    config.proxy.https    = ENV['https_proxy'] if ENV.key?('https_proxy')
+    config.proxy.no_proxy = ENV['no_proxy'] if ENV.key?('no_proxy')
+  end
+  priv = { privileged: true }
+  config.vm.provision "shell", priv.merge(inline: "apt-get install ruby1.9.1 ruby1.9.1-dev rubygems1.9.1 build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev libxml2-dev libxslt-dev git -y")
+  config.vm.provision "shell", priv.merge(inline: "gem install bundler --no-rdoc --no-ri")
+  config.vm.provision "shell", priv.merge(inline: "gem install rake --no-rdoc --no-ri")
+  config.vm.provision "shell", inline: "/srv/forj/vagrant/configure/install.sh"
+  config.vm.provision "shell", inline: "echo 'echo \"Call /srv/forj/vagrant/configure/install.sh to reinstall forj/lorj from source\"' >> ~vagrant/.bash_profile"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.29.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.29.0
 description: forj cli - See https://www.forj.io for documentation/information
 email:
 - forj@forj.io
@@ -215,6 +229,10 @@ files:
 - spec/setup_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_spec.rb
+- vagrant/README.md
+- vagrant/configure/install.sh
+- vagrant/fedora/Vagrantfile
+- vagrant/ubuntu/Vagrantfile
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.