forj 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107e066d39b5e872886f29e3cf357d762770f52d
-  data.tar.gz: c72b3a154b661f05bac54dd38d3bb4207fb48004
+  metadata.gz: 104016c81c311f9a0f4454a0f50aadeb9e2810a2
+  data.tar.gz: 07452ff472445eed9d882d1d8e153c75b7b27182
 SHA512:
-  metadata.gz: 963e240a9957f4b5ae872ea3fa046a7cdd70169d6006eea9cb32e7aca2dc29b9e10c8befb473d36d64abc8a281f815766ce319efc310eb5ea78adb819287803e
-  data.tar.gz: c75c3cb8fd8e175d40f00e24120f20a93b1566d3fedb05b3487ba448d1ba466d972d84d2e5193e5a8f14414c5d8e3d9ea736774cdd4966896c5922353290e368
+  metadata.gz: dc95fd28f3de676003c62a1804725ca4225199391c78096a200a048c92d02207324d19ffd6a127b9a446baafe6b16a28ca3a49c90d676e2a6db33fbf35dd75a0
+  data.tar.gz: f1f431e9d6ebb546d1f524b921db1098ce537ec5a263ea310a87f2b6ff36fc35261d37552f8b4e0fe8568d551ee5beb9daf115b8042f689a4ca26ea0c508688f

data/README.md

@@ -176,6 +176,23 @@ To ssh into a server
     forj ssh <name> <node>
     e.g. forj ssh maestro_01 [maestro, ci, util, review] # the nodes from your blueprint
 
+Excon and SSL Issue
+===================
+
+If you are connecting to a private cloud, you may need to provide some additional certificate data:
+
+Excon env variables:
+* SSL_CERT_DIR : path_to_certs
+* SSL_CERT_FILE: path_to_file
+
+Ex: 
+
+    export SSL_CERT_FILE=~/ca.crt
+    forj setup myAccount openstack
+
+or 
+
+    SSL_CERT_FILE=~/ca.crt forj setup myAccount openstack
 
 Contributing to Forj
 =====================

data/bin/forj

@@ -34,6 +34,7 @@ PrcLib.pdata_path = File.expand_path(File.join('~', '.cache', PrcLib.app_name))
 require 'appinit.rb' # Load Application settings features
 Forj.keypairs_path = File.join(PrcLib.data_path, 'keypairs')
 Forj.build_path = File.join(PrcLib.data_path, '.build')
+Forj.file_version = '1.0.0'
 
 require 'forj-settings.rb' # Settings features
 
@@ -57,27 +58,43 @@ Quick steps: How to create a forj?
 ----------------------------------
 
 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)
+Currently forj cli supports folowing providers:
+
+- openstack: openstack cloud and hp helion cloud (Fog)
+- hpcloud  : HP Public cloud (Fog)
+
+This list can be expanded to more clouds.
+
+If you want to contribute to support your cloud, check out:
+http://github.com/forj-oss/lorj_cloud
 
 1.  Setup your FORJ account.
-    `$ forj setup [AccountName] [--provider Provider]`
 
-    Ex: `forj setup MyForjAccount`. In this example:
-      You will setup 'MyForjAccount' with your HPHelion account.
-      The first time, this account will become the default one.
+    `$ forj setup`
+
+  This will create an account 'hpcloud' configured with 'hpcloud' provider
+
+  If you want another provider:
+
+    `$ forj setup MyAccountName openstack`
 
-**IMPORTANT NOTE** By default, forj setup will propose you to create your forge
-  on HPHelion (provider 'hpcloud').
-If AccountName is not set, the account name will be proposed to be name
-  'hpcloud' as well!
+  The first time you setup an account, it will become the default one.
 
 2.  Create your forge on your default account
     `$ forj boot <blueprint> <InstanceName>`
 
     Ex: `forj boot redstone MyForge`. In this example:
       Forj will create a `redstone` blueprint forge named `MyForge`,
-      using the default `MyForjAccount`.
+      using the default account.
+
+  If you want to create your forge on another cloud account, do the following:
+
+    `$ forj boot <blueprint> <InstanceName> [-a account]`
+
+    Ex: `forj boot redstone MyForge -a MyAccountName`. In this example:
+      Forj will create a `redstone` blueprint forge named `MyForge`,
+      using the 'MyAccountName' account.
+
 
 forj command line details:
 --------------------------
@@ -130,16 +147,15 @@ If you want to check/updated them, use `forj get [-a account]`
   method_option :maestro_flavor,   :aliases => '-f',   :desc => 'config:' \
     ' flavor        : Maestro flavor to use.'
   method_option :bp_flavor,        :aliases => '-b',   :desc => 'config:' \
-    ' bp_flavor     : Blueprint nodes default flavor to use.'       \
-    + "\n\n" + ' Build system options:'
+    ' bp_flavor     : Blueprint nodes default flavor to use.'\
+    "\n\n 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.' \
-    + "\n\n" + 'Maestro/infra bootstrap debugging:'
+    "name to clone for maestro.\n\nMaestro/infra bootstrap debugging:"
   method_option :test_box,         :aliases => '-T',   :desc => 'Identify a' \
     ' path to become your test-box repository.' \
     "\n                                            " \
@@ -192,10 +208,16 @@ queriable Objects:
         " and update with 'forj set'"
     when 'account'
       unless name
-        puts "List of FORJ accounts: Use 'forj account YourAccount' " \
-          ' to see one account details.'
         o_accounts = Lorj::Accounts.new
-        puts o_accounts.dump.to_yaml
+        accounts = o_accounts.dump
+        if accounts.length == 0
+          PrcLib.message 'No accounts found. Use forj setup [Account '\
+          '[provider]] to create your first account.'
+          return
+        end
+        PrcLib.message "List of FORJ accounts: Use 'forj account YourAccount'" \
+          ' to see one account details.'
+        puts accounts.to_yaml
         return
       end
       o_config = Lorj::Account.new
@@ -336,6 +358,9 @@ ex: forj ssh myforge -n review
     ' create ssh connection'
   method_option :identity,       :aliases => '-i',   :desc => 'Private key' \
     ' file 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 ssh(oInstanceName)
     Forj::Settings.common_options(options)
@@ -345,8 +370,13 @@ ex: forj ssh myforge -n review
 
     # Setting account at runtime layer
     account[:account_name] = options[:account_name] if options[:account_name]
+
     # Setting account at account layer
-    account.ac_load account[:account_name]
+    unless account.ac_load account[:account_name]
+      PrcLib.fatal(1, "Invalid account '%s'. Use `forj show account` "\
+                      'to get the list of valid accounts.',
+                   account[:account_name])
+    end
 
     account.set(:box_ssh,   options[:box_name])  if options[:box_name]
     account.set(:identity,  options[:identity]) if options[:identity]
@@ -380,13 +410,23 @@ Several data will be requested like:
     Forj::Settings.common_options(options)
     require 'cloud_connection.rb'
 
-    account = Lorj::Account.new(options[:config])
-    account.set(:provider_name, sProvider)
-    account.set(:account_name, sAccountName)
+    account = Lorj::Account.new(options[:config], Forj.file_version)
+    account.ac_new(sAccountName, sProvider) unless account.ac_load(sAccountName)
 
     o_cloud = Forj::CloudConnection.connect(account)
-    o_cloud.setup(:forge, sAccountName)
+
+    PrcLib.high_level_msg("Setting up '%s' with provider '%s'\n",
+                          sAccountName, account[:provider])
+
+    o_cloud.setup(:forge)
+
     o_cloud.config.ac_save
+    unless o_cloud.config.local_exist?(:account_name)
+      PrcLib.info("Setting account '%s' as default. You can change it with "\
+                  '`forj set account_name=<new account>`', sAccountName)
+      o_cloud.config.local_set(:account_name, sAccountName)
+    end
+    o_cloud.config.save_local_config
     PrcLib.high_level_msg("\nAccount %s '%s' saved.\n", sProvider, sAccountName)
   end
 end

data/forj/defaults.yaml

@@ -135,6 +135,7 @@
       :default_value:      "<%= Forj.keypairs_path %>"
     :keypair_base:
       :desc:               "Contains the key file base name without .pem/.pub."
+      :default_value:      "<%= config[:keypair_name] %>"
     :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."
       :required:           true
@@ -208,7 +209,7 @@
     :tenant_name:
       :desc:            "Tenant name required by fog/openstack on gardener"
       :account:         true
-      :validate:        !ruby/regexp /^\w?[\w_-]*$/
+      :validate:        !ruby/regexp /^\w?[\w_:-]*$/
       :ask_step:        1
       :ask_sort:        0
       :default_value:   "<%= (config[:provider_name] == 'openstack')?config[:tenant]:nil %>"

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.9'
-  s.date        = '2015-03-27'
+  s.version     = '1.0.10'
+  s.date        = '2015-04-17'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_runtime_dependency 'thor', '>=0.16.0'
-  s.add_runtime_dependency 'fog', '~>1.26.0'
   s.add_runtime_dependency 'git', '>=1.2.7'
   s.add_runtime_dependency 'highline', '>= 1.6.21'
   s.add_runtime_dependency 'ansi', '>= 1.4.3'
@@ -52,11 +51,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.8'
+  s.add_runtime_dependency 'lorj_cloud', '~> 0.1.0'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"
-  s.add_development_dependency "rubocop", ">=0.29.0"
+  s.add_development_dependency "rubocop", ">=0.30.0"
   s.rdoc_options << '--title' << 'Lorj - The Process Controllers framework system' <<
   '--main' << 'README.md'
 end

data/lib/appinit.rb

@@ -19,7 +19,7 @@
 #       or other kind of setting.
 module Forj
   class << self
-    attr_accessor :build_path, :keypairs_path
+    attr_accessor :build_path, :keypairs_path, :file_version
   end
 
   module_function
@@ -38,4 +38,8 @@ module Forj
     @build_path = File.expand_path(v) unless @build_path
     PrcLib.ensure_dir_exists(@build_path)
   end
+
+  def file_version=(v)
+    @file_version = v unless @file_version
+  end
 end

data/lib/boot.rb

@@ -29,7 +29,7 @@ module Forj
     def self.deprecated_name?(blueprint, on_or_name,
         old_accountname, as,
         old_name
-    )
+                             )
       # depreciated: <BluePrint> on <AccountName> as <InstanceName>
       if old_accountname && as && old_name
         msg = format(
@@ -100,6 +100,10 @@ module Forj
       end
     end
 
+    # rubocop: disable Metrics/CyclomaticComplexity
+    # rubocop: disable Metrics/MethodLength
+
+    # Boot process
     def self.boot(blueprint, on_or_name, deprecated_name, options)
       @account = Lorj::Account.new(options[:config])
 
@@ -115,14 +119,22 @@ module Forj
 
       @account[:account_name] = options[:account_name] if options[:account_name]
 
-      @account.ac_load @account[:account_name]
+      unless @account.ac_load @account[:account_name]
+        PrcLib.fatal(1, "Account '%s' not loaded. You need to call "\
+                     '`forj setup %s [provider]` to use this account.',
+                     @account[:account_name], @account[:account_name])
+      end
 
-      options_map = { :infra => :infra_repo, :key_name => :keypair_name,
-                      :key_path => :keypair_path,
+      options_map = { :infra          => :infra_repo,
+                      :key_name       => :keypair_name,
+                      :key_path       => :keypair_path,
                       :security_group => :security_group,
-                      :image_name => :image_name, :maestro_flavor => :flavor,
-                      :bp_flavor => :bp_flavor, :maestro_repo => :maestro_repo,
-                      :branch => :branch, :test_box => :test_box,
+                      :image_name     => :image_name,
+                      :maestro_flavor => :flavor,
+                      :bp_flavor      => :bp_flavor,
+                      :maestro_repo   => :maestro_repo,
+                      :branch         => :branch,
+                      :test_box       => :test_box,
                       :extra_metadata => :extra_metadata }
 
       load_options(options, options_map) do |key, value|

data/lib/cloud_connection.rb

@@ -15,26 +15,32 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'lorj_cloud'
+
 module Forj
   # Provide cloud object
   module CloudConnection
     def self.connect(account)
       a_processes = []
 
+      provider = account[:provider]
+
       # Defines how to manage Maestro and forges
+      # Uses 'cloud' module process provided by 'lorj_cloud'
+      a_processes << { :process_module => :cloud,
+                       :controller_name => provider }
+
       # create a maestro box. Identify a forge instance, delete it,...
-      a_processes << File.join(LIB_PATH, 'forj', 'ForjCore.rb')
+      a_processes << { :process_path => File.join(LIB_PATH, 'forj',
+                                                  'ForjCore.rb') }
 
       # Defines how cli will control FORJ features
       # boot/down/ssh/...
-      a_processes << File.join(LIB_PATH, 'forj', 'ForjCli.rb')
+      a_processes << { :process_path => File.join(LIB_PATH, 'forj',
+                                                  'ForjCli.rb') }
 
       # Loading CloudCore embedding provider controller + its process.
-      o_cloud = Lorj::CloudCore.new(
-        account,
-        account[:account_name],
-        a_processes
-      )
+      o_cloud = Lorj::Core.new(account, a_processes)
 
       o_cloud
     end

data/lib/cloud_test.rb

@@ -56,7 +56,7 @@ If you already have an existing infra workspace,
 Otherwise, we will build a new one with some predefined data,
  you can review and update later.
    END
-  )
+                 )
   s_ask = format(
     'Do you want to create a new one from Maestro (yes/no)?',
     infra_dir
@@ -90,11 +90,9 @@ server_id_length = 0
 server_name_length = 0
 
 o_forge[:server].each do |server|
-  if server[:id].length >  server_id_length
-    server_id_length = server[:id].length
-  end
+  server_id_length = server[:id].length if server[:id].length > server_id_length
 
-  if server[:name].length >  server_name_length
+  if server[:name].length > server_name_length
     server_name_length = server[:name].length
   end
 end
@@ -106,7 +104,7 @@ puts format(
   'Index '.ljust(6),
   'Name'.ljust(server_name_length),
   'ID'.ljust(server_id_length)
-     )
+)
 # Display Forge servers detail
 o_forge[:server].each do |server|
   puts format(
@@ -114,7 +112,7 @@ o_forge[:server].each do |server|
     server_index.to_s.ljust(6),
     server[:name].to_s.ljust(server_name_length),
     server[:id].to_s.ljust(server_id_length)
-       )
+  )
   server_index += 1
 end
 

data/lib/destroy.rb

@@ -28,8 +28,13 @@ module Forj
 
       # Setting account at runtime layer
       account[:account_name] = options[:account_name] if options[:account_name]
-      # Setting account at account layer
-      account.ac_load account[:account_name]
+
+      # Loading account at account layer
+      unless account.ac_load account[:account_name]
+        PrcLib.fatal(1, "Invalid account '%s'. Use `forj show account` "\
+                        'to get the list of valid accounts.',
+                     account[:account_name])
+      end
 
       o_cloud = Forj::CloudConnection.connect(account)
 

data/lib/forj/ForjCli.rb

@@ -25,7 +25,7 @@ class Lorj::BaseDefinition
   define_obj(:ssh,
 
              :create_e => :ssh_connection
-             )
+            )
   obj_needs :CloudObject,  :forge
   obj_needs :data,         :instance_name
   obj_needs :data,         :keypair_name

data/lib/forj/process/ForjProcess.rb

@@ -57,7 +57,7 @@ class ForjCoreProcess
     s_status = active_server?(server, o_address, boot_options[:keys],
                               boot_options[:coherent], s_status)
 
-    till_server_active(s_status, server, o_address, boot_options)
+    till_server_active(s_status, hParams, o_address, boot_options)
 
     o_forge = get_forge(sObjectType, config[:instance_name], hParams)
 
@@ -154,7 +154,7 @@ class ForjCoreProcess
 
   def active_server?(o_server, o_address, private_key_file,
                      keypair_coherent, s_status
-  )
+                    )
     if o_server[:attrs][:status] == :active
       image = server_get_image o_server
 
@@ -191,10 +191,14 @@ class ForjCoreProcess
   end
 end
 
+# rubocop:disable Metrics/ClassLength
+
 # Functions for boot - build_forge
 class ForjCoreProcess
+  # TODO: Rewrite this function to break it for rubocop.
   # rubocop:disable CyclomaticComplexity
 
+  # Function displaying the server status
   def maestro_create_status(sStatus, iCurAct = 4, pending_count = 0)
     s_activity = '/-\\|?'
     if iCurAct < 4
@@ -228,12 +232,16 @@ class ForjCoreProcess
   # TODO: Rewrite this function to break it for rubocop.
   # rubocop: disable PerceivedComplexity
   # rubocop: disable Metrics/MethodLength
+  # rubocop: disable Metrics/AbcSize
 
-  def till_server_active(s_status, o_server, o_address, boot_options)
+  # Loop until server is active
+  def till_server_active(s_status, hParams, o_address, boot_options)
     m_cloud_init_error = []
     i_cur_act = 0
     o_old_log = ''
     pending_count = 0
+    server_error = 0
+    o_server = hParams.refresh[:server, :ObjectData]
 
     while s_status != :active
       if i_cur_act == 4
@@ -244,10 +252,34 @@ class ForjCoreProcess
       maestro_create_status(s_status, i_cur_act, pending_count)
       i_cur_act += 1
       i_cur_act = i_cur_act % 4
+
+      if s_status == :restart
+        process_delete(:server)
+        PrcLib.message("Bad server '%s' removed. Creating a new one...",
+                       o_server[:name])
+        sleep(5)
+        process_create(:internet_server)
+        s_status = :starting
+        o_server = hParams.refresh[:server, :ObjectData]
+        next
+      end
+
       o_server = load_server(o_server)
-      # s_status = o_server[:attrs][:status]
+
+      if o_server[:status] == :error
+        if server_error == 1
+          PrcLib.fatal(1, 'Server tried to be rebuilt but failed again.')
+        end
+        server_error = 1
+        PrcLib.warning("The creation of server '%s' has currently failed. "\
+                       'Trying to rebuild it, once before give up.',
+                       o_server[:name])
+        s_status = :restart
+        next
+      end
+
       if s_status == :starting
-        s_status = :assign_ip if o_server[:attrs][:status] == :active
+        s_status = :assign_ip if o_server[:status] == :active
       elsif s_status == :assign_ip
         s_status = assign_ip_boot(o_address, boot_options, s_status, o_server)
       else # analyze the log output
@@ -342,7 +374,7 @@ done
     END
     s_msg = format(s_msg, o_server[:name], image[:ssh_user],
                    o_address[:public_ip], boot_options[:keys]
-    )
+                  )
     unless boot_options[:coherent]
       s_msg += ANSI.bold("\nUnfortunatelly") + " your current keypair' \
             ' is not usable to connect to your server.\nYou need to fix'   \
@@ -496,7 +528,7 @@ class ForjCoreProcess
         :salt => Time.now.to_i.to_s,
         :iv => Base64.strict_encode64(
           OpenSSL::Cipher::Cipher.new('aes-256-cbc').random_iv
-          )
+        )
       }
 
       PrcLib.debug("Writing '%s' key file", key_file)
@@ -644,14 +676,15 @@ class ForjCoreProcess
         clone_maestro_repo(maestro_url, path_maestro, config)
       end
    rescue => e
-     PrcLib.error('Error while cloning the repo from %s\n%s\n%s',
-                  maestro_url, e.message, e.backtrace.join("\n"))
-     PrcLib.info(
-       'If this error persist you could clone the repo manually in ~/.forj/'
-     )
+     PrcLib.error("Error while cloning the repo from %s\n%s\n%s"\
+                  "\nIf this error persist you could clone the repo manually"\
+                  " in '%s'",
+                  maestro_url, e.message, e.backtrace.join("\n"),
+                  h_result[:maestro_repo])
     end
     o_maestro = register(h_result, sObjectType)
     o_maestro[:maestro_repo] = h_result[:maestro_repo]
+    o_maestro[:maestro_repo_exist?] = File.directory?(h_result[:maestro_repo])
     o_maestro
   end
 end
@@ -896,7 +929,7 @@ class ForjCoreProcess
     ) unless File.exist?(mime)
   end
 
-  def build_userdata(sObjectType, hParams)
+  def build_userdata(sObjectType, hParams) # rubocop: disable Metrics/AbcSize
     # get the paths for maestro and infra repositories
     # maestro_path = hParams[:maestro_repository].values
     # infra_path = hParams[:infra_repository].values
@@ -911,6 +944,13 @@ class ForjCoreProcess
       format('userdata.mime.%s', rand(36**5).to_s(36))
     )
 
+    unless hParams[:maestro_repository, :maestro_repo_exist?]
+      PrcLib.fatal(1, "Maestro repository doesn't exist. This is required for "\
+                      "cloud_init user_data build. Check why '%s' "\
+                      "doesn't exist.",
+                   hParams[:maestro_repository, :maestro_repo])
+    end
+
     meta_data = JSON.generate(hParams[:metadata, :meta_data])
 
     build_tmpl_dir = File.expand_path(File.join(LIB_PATH, 'build_tmpl'))
@@ -1091,7 +1131,7 @@ class ForjCoreProcess
   # forj keypair storage. Otherwise this update is ignored.
   def save_sequences(private_key_file, forj_private_key_file,
                      public_key_file, forj_public_key_file, key_name
-  )
+                    )
     PrcLib.info('Importing key pair to FORJ keypairs list.')
 
     FileUtils.copy(private_key_file, forj_private_key_file)
@@ -1107,7 +1147,7 @@ class ForjCoreProcess
   # forj keypair storage. Otherwise this update is ignored.
   def save_md5(private_key_file, forj_private_key_file,
                public_key_file, forj_public_key_file
-  )
+              )
     # Checking source/dest files content
     if Digest::MD5.file(private_key_file).hexdigest !=
        Digest::MD5.file(forj_private_key_file).hexdigest
@@ -1138,7 +1178,7 @@ class ForjCoreProcess
     PrcLib.info("Configured forj keypair '%s' with '%s'",
                 keys[:keypair_name],
                 File.join(keys[:keypair_path], keys[:key_basename])
-                )
+               )
   end
 
   # keypair_files post setup
@@ -1214,16 +1254,16 @@ class ForjCoreProcess
   #
   def update_keypair_config(_ = nil)
     %w(local account).each do |config_name|
-      next if config.exist?(:keypair_base, :names => [config_name])
-
+      next if config.latest_version?(config_name)
       keypair_path = config.get(:keypair_path, nil, :name => config_name)
 
-      next if keypair_path.nil?
-
-      options = { :name => config_name }
-      options.merge!(:section => :default) if config_name == 'local'
-      config.set(:keypair_base, File.basename(keypair_path), options)
-      config.set(:keypair_path, File.dirname(keypair_path), options)
+      unless keypair_path.nil?
+        options = { :name => config_name }
+        options.merge!(:section => :default) if config_name == 'local'
+        config.set(:keypair_base, File.basename(keypair_path), options)
+        config.set(:keypair_path, File.dirname(keypair_path), options)
+      end
+      config.version_set(config_name, Forj.file_version)
     end
     true
   end
@@ -1296,6 +1336,7 @@ class ForjCoreProcess
     return true if key_name.nil?
     config[:key_cloud_coherence] = false
     cloud_key = process_get(:keypairs, key_name)
+    register(cloud_key)
     if !cloud_key.empty?
       if cloud_key[:coherent]
         config[:key_cloud_coherence] = true
@@ -1305,10 +1346,15 @@ class ForjCoreProcess
       return true
     end
     keypair_display(cloud_key)
-    s_ask = 'Do you still want to create new key?'
-    PrcLib.fatal(1, 'This keypair name cannot be used. ' \
-                    'You may check keypair_path setting ' \
-                    'in your account.') unless agree(s_ask)
+
+    return true unless cloud_key[:public_key_exist?]
+
+    PrcLib.message("You need to create a new keypair instead of '%s'"\
+                   'or quit the setup to get the original key and retry.',
+                   key_name)
+    s_ask = 'Do you want to create new keypair?'
+
+    PrcLib.fatal(1, 'Quitting setup per your request.') unless agree(s_ask)
     false
   end
 
@@ -1316,11 +1362,24 @@ class ForjCoreProcess
   # return true  continue to ask keypair files
   # return false skip asking keypair files
   def forj_cloud_keypair_coherent?(_keypair_files)
+    return true unless config.exist?(:key_cloud_coherence)
+
+    keypair = data_objects(:keypairs)
+
+    return true unless keypair.nil? || keypair[:private_key_exist?]
+
     if config[:key_cloud_coherence]
       PrcLib.message('Your local ssh keypair is detected ' \
                      'and valid to access the box.')
       return false
     end
+    match = ANSI.bold(format('matching %s keypair name previously set',
+                             ANSI.red(config[:keypair_name])))
+    desc = 'the base keypair file name (with absolute path) ' + match
+
+    Lorj.data.set(:sections, :credentials, :keypair_files,
+                  { :desc => desc }, 'setup')
+
     true
   end
 end

data/lib/forj-settings.rb

@@ -24,6 +24,19 @@ module Forj
         PrcLib.core_level = options[:lorj_debug].to_i
         PrcLib.level = Logger::DEBUG
       end
+      latest_version?(options[:account_name]) if options[:account_name]
+    end
+
+    def self.latest_version?(account_name)
+      config = Lorj::Account.new(nil, Forj.file_version)
+
+      config.ac_load account_name
+
+      PrcLib.fatal(1,
+                   "Your account '%s' is obsolete, use `forj setup`," \
+                   ' to update it.',
+                   account_name) \
+                   unless config.latest_version?('account')
     end
 
     def self.account_show_all(account_name)
@@ -35,12 +48,12 @@ module Forj
       puts format(
         "List of account settings for provider '%s': ",
         config.get(:provider)
-           )
+      )
       puts format(
         "%-15s %-12s :\n------------------------------",
         'key',
         'section name'
-           )
+      )
 
       config.meta_each do |section, found_key, hValue|
         next if hValue.rh_get(:readonly)
@@ -50,11 +63,11 @@ module Forj
       puts format(
         "\nUse `forj set KeyName=Value -a %s` to set one.",
         [account_name]
-           )
+      )
       puts format(
         'Use `forj get -a %s`               to check current values.',
         account_name
-           )
+      )
     end
 
     def self.config_show_all
@@ -64,7 +77,7 @@ module Forj
         "%-15s %-12s :\n------------------------------",
         'key',
         'section name'
-           )
+      )
       config.meta_each do |section, found_key, hValue|
         next if hValue.rh_get(:readonly)
         s_desc = hValue.rh_get(:desc)
@@ -157,7 +170,7 @@ module Forj
           full_key,
           s_bef,
           ANSI.bold + s_aft + ANSI.clear
-             )
+        )
       end
       config.ac_save if b_dirty
     end
@@ -271,7 +284,7 @@ module Forj
             s_upd_msg,
             mykey,
             section
-               )
+          )
         end
       end
     end
@@ -293,7 +306,7 @@ module Forj
           '--------------', 'U',
         'key', 'origin',
         'section name'
-           )
+      )
 
       get_account_values(oConfig, account_name)
 
@@ -302,12 +315,12 @@ module Forj
       puts format(
         'Use `forj set <key>=<value> -a %s` to update account data.',
         account_name
-           )
+      )
       puts format(
         'Or  `forj set <key>= -a %s`        '\
           'to restore key default value.',
         account_name
-           )
+      )
     end
 
     def self.config_get_all(oConfig)
@@ -318,7 +331,7 @@ module Forj
           '-----', 'U',
         '''key', 'origin',
         'section name'
-           )
+      )
 
       oConfig.meta_each do |section, found_key, hValue|
         s_upd_msg = '+'
@@ -339,14 +352,14 @@ module Forj
             ANSI.clear,
             section,
             oConfig.get(found_key)
-               )
+          )
         else
           puts format(
             '%s %-19s(       ) %-12s: unset',
             s_upd_msg,
             found_key,
             section
-               )
+          )
         end
       end
       puts "\nUse 'forj set <key>=<value>' to update defaults on values" \
@@ -364,14 +377,14 @@ module Forj
           "%s: '%s'",
           oConfig.where?(key)[0],
           oConfig.get(key)
-             )
+        )
       elsif oConfig.where?(key.parameterize.underscore.to_sym)
         key_symb = key.parameterize.underscore.to_sym
         puts format(
           "%s: '%s'",
           oConfig.where?(key_symb)[0],
           oConfig.get(key_symb)
-             )
+        )
       else
         PrcLib.message("key '%s' not found", key)
       end

data/lib/ssh.rb

@@ -80,8 +80,8 @@ module Forj
             ((s_default.nil?) ? '' : format(
               'Default: ' + "|%s|\n", s_default
             ))
-          )
       )
+         )
       value = choose do |q|
         q.choices(*server_list)
         q.default = s_default unless s_default.nil?

data/vagrant/README.md

@@ -49,3 +49,43 @@ Example use cases:
     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
+
+# fog openstack V3 auth
+
+To use the latest openstack authentication v3 (including domain), you need to get fog 1.30 or get it from source. hphelion 1.1 uses openstack authentication V3.
+
+Currently, gem fog 1.30 doesn't exist. So, this section will explain what needs to be done to get the latest patch from github
+
+We assume vagrant is installed and working perfectly.
+
+1. clone fog, cli and lorj patches from source.
+
+    $ mkdir -p ~/tmp/src
+    $ cd ~/tmp/src
+    $ git clone https://github.com/clarsonneur/fog.git
+    $ cd fog
+    $ sed -i 's/1.29/1.30/g' fog.gemspec
+    $ cd -
+    $ git clone https://github.com/forj-oss/lorj.git
+    $ cd lorj
+    $ git fetch https://review.forj.io/forj-oss/lorj refs/changes/55/2555/4 && git cherry-pick FETCH_HEAD
+    $ cd -
+    $ git clone https://github.com/forj-oss/cli.git
+    $ cd cli
+    $ git fetch https://review.forj.io/forj-oss/cli refs/changes/47/2547/6 && git cherry-pick FETCH_HEAD
+    $ cd -
+
+2. set some tasks to execute before install forj cli
+
+    $ src="~/tmp/src/fog:bundler install ;gem build fog.gemspec ;gem install fog-1.30.0.gem"
+    $ src="$src;|~/tmp/src/lorj/:bundler install ;rake install"
+    $ export src
+    $ cd ~/tmp/src/cli/vagrant/fedora # You can try ubuntu as well in ../ubuntu
+    $ vagrant up  # The box is going to be created and provisionned.
+    $ vagrant ssh # You are in!
+
+3. if needed, you can set the SSL_CERT_FILE, or SSL_CERT_PATH if you having trouble with https certificates.
+  We assume you are still in your vagrant box.
+    $ export
+
+4. Do any forj task, like forj setup, boot or destroy...

data/vagrant/fedora/Vagrantfile

@@ -52,6 +52,17 @@ Vagrant.configure(2) do |config|
     end
   end
 
+  src_data = {}
+  if ENV.key?('src')
+    # Support '<path1>:cmd1[;cmd2[;...]];|[path2:cmd3...]'
+    src_list = ENV['src'].split(';|')
+    src_list.each do |src|
+      src_name, cmd = src.split(':')
+      src_data[src_name] = cmd
+      config.vm.synced_folder src_name, File.join('/srv', File.basename(src_name))
+    end
+  end
+
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
@@ -86,10 +97,15 @@ Vagrant.configure(2) do |config|
     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", priv.merge(inline: "yum install ruby-devel libxml2-devel libxslt-devel python-yaml gcc git tar patch gcc-c++ -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"
+  src_data.each do |key, value|
+    path = File.join('/srv', File.basename(key))
+    value = "echo 'Nothing more to do in #{path}'" if value.nil?
+    config.vm.provision "shell", inline: "cd #{path} ; #{value}"
+  end
   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

@@ -5,6 +5,8 @@
 # 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
@@ -40,11 +42,24 @@ Vagrant.configure(2) do |config|
   # 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
+
+  src_data = {}
+  if ENV.key?('src')
+    # Support '<path1>:cmd1[;cmd2[;...]];|[path2:cmd3...]'
+    src_list = ENV['src'].split(';|')
+    src_list.each do |src|
+      src_name, cmd = src.split(':')
+      src_data[src_name] = cmd
+      config.vm.synced_folder src_name, File.join('/srv', File.basename(src_name))
     end
   end
 
@@ -86,6 +101,12 @@ Vagrant.configure(2) do |config|
   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: "echo 'PATH=$PATH:/usr/local/bin' >> /etc/profile.d/local.sh"
+  src_data.each do |key, value|
+    path = File.join('/srv', File.basename(key))
+    value = "echo 'Nothing more to do in #{path}'" if value.nil?
+    config.vm.provision "shell", inline: "cd #{path} ; #{value}"
+  end
   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"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.26.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.11
 - !ruby/object:Gem::Dependency
-  name: lorj
+  name: lorj_cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
 description: forj cli - See https://www.forj.io for documentation/information
 email:
 - forj@forj.io