forj 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a062220b32731df2805ca604f0f0cb2233613075
-  data.tar.gz: d5c331135e78162961bc967e328530127aeacb0c
+  metadata.gz: 613daa28b3ba9524c23beed49420d1893e909c24
+  data.tar.gz: da633b67dda381136608a689d9c47c484d5618c7
 SHA512:
-  metadata.gz: 12720b05fba4b2f5fd348039db09f2900984f080da139d9b3c48fecc67b0eb9c2cf7d788af47f6abb6dd19b8dc5896e284ee114f7e06746e02ac27d2fcdc9f62
-  data.tar.gz: 7980b5830ec4de440b24e8baa7cade68ff3df6eee1c7c287abd221e0494e2e471ec80417de0259479b9928dd8560e3f67eb64e89489a7a74a1bef1b4cb8196b5
+  metadata.gz: dbddb2c23bf804063c3106a646d08985c685dfc0b30363825bcda8b645534b7f09fec7a08c528bc0879bd9f8f38950cf054bab790fb069d6c1424a37411881eb
+  data.tar.gz: 5e8fcd27a45a2ce4153e699c5b70522637749f0fdb41460ed6f2d86bd98f33120869ec8b336cff7936ae8e822bb5f8deed187f5eb9beddab775c2f4a534a9f80

data/README.md

@@ -5,6 +5,8 @@ Forj cli
 Installation
 ------------
 
+Forj cli supports Ruby 1.9.3 or higher.
+
 ###Fedora/CentOS/Redhat rpm like package system
 
 **For ruby 2.0**
@@ -17,19 +19,7 @@ Installation
 **For ruby 1.9**
 
     $ apt-get -y update
-    $ sudo 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
-    $ sudo gem install forj
-
-
-**For ruby 1.8**
-
-    $ sudo apt-get install ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 rubygems -y
-    $ sudo apt-get install libreadline-ruby1.8 libruby1.8 libopenssl-ruby -y
-    $ sudo apt-get install libxslt-dev libxml2-dev -y
-    $ sudo gem install nokogiri
-    $ sudo apt-get install ruby-bundler -y
-    $ sudo gem install mime-types -v 1.25.1
-    $ sudo gem install hpcloud
+    $ sudo apt-get install ruby1.9.3 ruby1.9.3-dev rubygems1.9.3 build-essential libopenssl-ruby1.9.3 libssl-dev zlib1g-dev libxml2-dev libxslt-dev git -y
     $ sudo gem install forj
 
 **Installation from source**
@@ -93,12 +83,7 @@ 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`
+NOTE: If you are creating a Forge in a corporate network, a proxy may be required. See section [Commmon issues]
 
 ###Forj options:
 
@@ -123,76 +108,96 @@ Commands:
 
 #### Configuration
 
-While building your forge, forj needs to load some data by default. Those are listed in the application.
+When you create a new forj (`forj boot`), forj cli will load data from several layers of configuration:
+
+1. Cloud account setting (`forj setup [account]` or `forj get -a <account>` list identified by 'account' origin)
+2. Local configuration (`forj get` list identified by 'local' origin)
+3. Application defaults and cloud model. (`forj get` list identified by 'forj_core' or 'default')
+
+You can get a complete list of current values:
 
-You can show them with :
+    $ forj get
+or
 
-    $ forj show defaults
+    $ forj get -a <account>
 
 If you need to change one of them:
 
-    $ forj set "keypair_name=MyKeypairName"
+    $ forj set "security_group=test"
+or
 
-ex:
-    forj set keypair_name=nova
+    $ forj set "security_group=mysec" -a <account>
 
-You can check what kind of value, forj will use to boot/access your forge:
+#### Connect to servers
 
-    $ forj get -a dev
+To ssh into a server
 
+    $ forj ssh <name> [node]
+e.g.
 
-#### Your config.yaml
+    $ forj ssh myforge review # review is one node from redstone blueprint
 
-The following list gives you some details about keys/values required to boot/access your forge.
+Commmon issues
+==============
 
+Certificate Authorities
+-----------------------
 
-~/.forj/config.yaml:
+If your company certify your server with a private certificate authorities service, you may need to do the following:
 
-     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>
-       maestro_url: url         # Maestro GIT repository for clone.
-       infra_repo: path         # Path to the default Infra repository used to store your specific bootstrap/build environment. By default: ~/.forj/infra
-       image: imageName         # 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)'
-                                # If you have created the generic proto2b image, you can set it here.
-       flavor: flavorName       # Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs.
-                                # By default: standard.medium
-       bp_flavor: flavorName    # Blueprint nodes default flavor. Usually, blueprint node are smaller than Maestro.
-                                # By default: standard.small
-       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. ~/.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.
-       # Internal use.
-       build_config: name       # forj cli use 'build.sh' to create Maestro. See build_config option on build.sh to get more information. By default 'box'
-       branch: name             # forj cli use 'build.sh' to create Maestro. See gitbranch option on build.sh to get more information. By default 'master'
-       box_name: maestro        # forj cli use 'build.sh' to create Maestro. See box_name option on build.sh to get more information. By default 'maestro'
+Either your workstation and your cloud may needs to be configured with this CA certificate.
 
-To ssh into a server
+* From your workstation:
 
-    forj ssh <name> <node>
-    e.g. forj ssh maestro_01 [maestro, ci, util, review] # the nodes from your blueprint
+    You can instantly provide the CA certificate to forj cli, with SSL_CERT_FILE env variable<BR>
+    ex:
 
-Excon and SSL Issue
-===================
+        SSL_CERT_FILE=~/tmp/cacert.crt forj boot redstone [...]
+
+    OR<BR>
+
+    You can install this certificate in your workstation. This case depends on your OS.<BR>
+    typical case:
+
+    * debian like system:
+        - cp file to /usr/share/ca-certificates/
+        - Update /etc/ca-certificates.conf
+        - call update-ca-certificates
+    * rpm like system:
+        - cp file to /etc/pki/ca-trust/source/anchors/
+        - call update-ca-trust extract
+
+* In your cloud:
+
+    If your cloud is NOT preconfigured (images) with your Company CA certificate,
+    you can call forj cli with --ca-root-cert at boot time, to configure your boxes with this missing certificate.
+
+    ex:
+
+        forj boot redstone myforge --ca-root-cert ~/tmp/cacert.crt
+
+    You can ask server in your cloud to install it in specific path and file name
+
+        forj boot redstone myforge --ca-root-cert '~/tmp/cacert-2015-1.crt#mycompany/cacrt.crt'
+
+    You can also pre-configure your forj account with this certificate.
+
+        forj set ca-root-cert=~/tmp/cacert-2015-1.crt -a myaccount
+    or
+
+        forj set 'ca-root-cert=~/tmp/cacert-2015-1.crt#mycompany/cacrt.crt' -a myaccount
 
-If you are connecting to a private cloud, you may need to provide some additional certificate data:
+HTTP/HTTPS proxy
+----------------
 
-Excon env variables:
-* SSL_CERT_DIR : path_to_certs
-* SSL_CERT_FILE: path_to_file
+If your cloud is NOT preconfigured (images) with your Company proxy setting,
+you can ask forj cli to configure your server with the Proxy setting needed.
 
-Ex: 
 
-    export SSL_CERT_FILE=~/ca.crt
-    forj setup myAccount openstack
+Ex: boot a redstone 'myforge' with a proxy setting.
 
-or 
+    $ forj boot redstone myforge -a CorporateAccount -e webproxy=$http_proxy
 
-    SSL_CERT_FILE=~/ca.crt forj setup myAccount openstack
 
 Contributing to Forj
 =====================

data/bin/forj

@@ -16,8 +16,8 @@
 #    limitations under the License.
 
 require 'rubygems'
-# require 'debugger' # Use to debug with Ruby < 2.0
-# require 'byebug'   # Use to debug with Ruby >= 2.0
+#  require 'debugger' # Use to debug with Ruby < 2.0
+#  require 'byebug'   # Use to debug with Ruby >= 2.0
 require 'bundler/setup'
 require 'thor'
 require 'ansi'
@@ -166,24 +166,27 @@ If you want to check/updated them, use `forj get [-a account]`
   method_option :tb_path,  :aliases => '-t',
                            :desc => 'Define the path to the test-box script. '\
                                     'This option superseeds the TEST_BOX '\
-                                   'environment variable.'
+                                    'environment variable.'
   method_option :test_box, :aliases => '-T', :type => :array,
                            :desc => "Use a local repository for test-box\n\n"\
                                     'Other options:'
   method_option :extra_metadata,   :aliases => '-e',   :desc => 'Custom' \
     ' server metadata format key1=value1,key2=value2...,keyN=valueN'
 
+  method_option :webproxy,      :aliases => '-x',
+                                :desc => 'Set HTTP/HTTPS proxy setting from'\
+                                         ' your cloud'
   method_option :ca_root_cert,  :desc => 'Certificate Authorities file used by'\
     ' your compagny to authenticate your intranet servers.'
 
   def boot(blueprint, on_or_name, old_accountname = nil, as = nil,
            old_name = nil)
-    Forj::Settings.common_options(options)
+    opts = Forj::Settings.common_options(options)
     require 'boot.rb'
 
     deprecated_name = [old_accountname, as, old_name]
 
-    Forj::Boot.boot(blueprint, on_or_name, deprecated_name, options)
+    Forj::Boot.boot(blueprint, on_or_name, deprecated_name, opts)
   end
 
   ################################# Show defaults
@@ -201,7 +204,7 @@ queriable Objects:
   desc 'show <Object> [name]', 'Show Object (default valuesr, account data,' \
     ' etc...) values.'
   def show(object, name = nil)
-    Forj::Settings.common_options(options)
+    opts = Forj::Settings.common_options(options)
 
     case object
     when 'defaults'
@@ -240,7 +243,7 @@ queriable Objects:
       puts o_config.config_dump([%(account)]).to_yaml
       puts '---'
       puts format("To change those values, execute 'forj setup -a %s'.",
-                  options[:account_name])
+                  opts[:account_name])
 
     else
       PrcLib.error("object '%s' unknown.", name)
@@ -265,8 +268,8 @@ Warning! This action do not remove any network/security groups cloud object.
      ' Account, config file or forj defaults.'
   def destroy(name)
     require 'destroy.rb'
-    Forj::Settings.common_options(options)
-    Forj::Destroy.destroy(name, options)
+    opts = Forj::Settings.common_options(options)
+    Forj::Destroy.destroy(name, opts)
   end
 
   ################################# SET
@@ -310,13 +313,12 @@ you can set it as your default, with:
     ' local config file.'
 
   def set(*p)
-    PrcLib.level = Logger::INFO if options[:verbose]
-    PrcLib.level = Logger::DEBUG if options[:debug]
+    opts = Forj::Settings.common_options(options)
 
     if p.length == 0
-      Forj::Settings.show_settings(options)
+      Forj::Settings.show_settings(opts)
     else
-      Forj::Settings.set_settings(options, p)
+      Forj::Settings.set_settings(opts, p)
     end
   end
 
@@ -349,11 +351,9 @@ or from your ~/.forj/config.yaml, or if not found, from application defaults.
     ' local config file.'
 
   def get(key = nil)
-    PrcLib.level = Logger::INFO if options[:verbose]
-    PrcLib.level = Logger::DEBUG if options[:debug]
-
+    opts = Forj::Settings.common_options(options)
     require 'get.rb'
-    Forj::Get.get(options, key)
+    Forj::Get.get(opts, key)
   end
 
   ################################# SSH
@@ -373,13 +373,13 @@ ex: forj ssh myforge -n review
     ' local config file.'
 
   def ssh(oInstanceName)
-    Forj::Settings.common_options(options)
+    opts = Forj::Settings.common_options(options)
     require 'ssh.rb'
 
-    account = Lorj::Account.new(options[:config])
+    account = Lorj::Account.new(opts[:config])
 
     # Setting account at runtime layer
-    account[:account_name] = options[:account_name] if options[:account_name]
+    account[:account_name] = opts[:account_name] if opts[:account_name]
 
     # Setting account at account layer
     unless account.ac_load account[:account_name]
@@ -388,8 +388,8 @@ ex: forj ssh myforge -n review
                    account[:account_name])
     end
 
-    account.set(:box_ssh,   options[:box_name])  if options[:box_name]
-    account.set(:identity,  options[:identity]) if options[:identity]
+    account.set(:box_ssh,   opts[:box_name])  if opts[:box_name]
+    account.set(:identity,  opts[:identity]) if opts[:identity]
 
     Forj::Ssh.connect(oInstanceName, account)
   end
@@ -417,10 +417,10 @@ Several data will be requested like:
 \x5- domain name to add to each boxes hostname
   LONGDESC
   def setup(sAccountName = 'hpcloud', sProvider = 'hpcloud')
-    Forj::Settings.common_options(options)
+    opts = Forj::Settings.common_options(options)
     require 'cloud_connection.rb'
 
-    account = Lorj::Account.new(options[:config], Forj.file_version)
+    account = Lorj::Account.new(opts[:config], Forj.file_version)
     account.ac_new(sAccountName, sProvider) unless account.ac_load(sAccountName)
 
     o_cloud = Forj::CloudConnection.connect(account)

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.13'
-  s.date        = '2015-05-26'
+  s.version     = '1.0.14'
+  s.date        = '2015-06-05'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 

data/lib/boot.rb

@@ -38,7 +38,7 @@ module Forj
           blueprint, old_accountname, old_name, blueprint, old_name
         )
 
-        if account.get('account_name') == old_accountname
+        if account.get(:account_name) == old_accountname
           PrcLib.warning('%s` instead.', msg)
         else
           PrcLib.warning("%s -a '%s'` instead.", msg, old_accountname)
@@ -127,7 +127,6 @@ module Forj
                      @account[:account_name], @account[:account_name])
       end
 
-      options = options.to_h
       options['tb_path'] = nil if options.key?('test_box') &&
                                   !options.key?('tb_path')
       options_map = { :infra          => :infra_repo,
@@ -142,7 +141,8 @@ module Forj
                       :test_box       => :test_box,
                       :tb_path        => :test_box_path,
                       :ca_root_cert   => :ca_root_cert,
-                      :extra_metadata => :extra_metadata }
+                      :extra_metadata => :extra_metadata,
+                      :webproxy       => :webproxy }
 
       load_options(options, options_map) { |k, v| complete_boot_options(k, v) }
 

data/lib/forj-settings.rb

@@ -20,13 +20,20 @@ module Forj
   # This module helps you to setup your forge's account
   module Settings
     def self.common_options(options)
-      PrcLib.level = Logger::INFO if options[:verbose]
-      PrcLib.level = Logger::DEBUG if options[:debug]
-      unless options[:lorj_debug].nil?
-        PrcLib.core_level = options[:lorj_debug].to_i
+      opts = options.to_hash
+      if opts.rh_key_to_symbol?
+        opts = opts.rh_key_to_symbol
+        PrcLib.debug('Thor options converted to use Symbol instead of String '\
+                     'in keys')
+      end
+      PrcLib.level = Logger::INFO if opts[:verbose]
+      PrcLib.level = Logger::DEBUG if opts[:debug]
+      unless opts[:lorj_debug].nil?
+        PrcLib.core_level = opts[:lorj_debug].to_i
         PrcLib.level = Logger::DEBUG
       end
-      latest_version?(options[:account_name]) if options[:account_name]
+      latest_version?(opts[:account_name]) if opts[:account_name]
+      opts
     end
 
     def self.latest_version?(account_name)
@@ -74,14 +81,19 @@ module Forj
 
     def self.config_show_all
       config = Lorj::Account.new
+
+      a_processes = [{ :process_module => :cloud },
+                     { :process_module => :forj_core }]
+
+      # Loading CloudCore embedding provider controller + its process.
+      Lorj::Core.new(config, a_processes)
+
       puts 'List of available FORJ default settings:'
-      puts format(
-        "%-15s %-12s :\n------------------------------",
-        'key',
-        'section name'
-      )
+      puts format("%-15s %-12s :\n------------------------------",
+                  'key', 'section name')
+
       config.meta_each do |section, found_key, hValue|
-        next if hValue.rh_get(:readonly) || hValue.rh_get(:get) == fals
+        next if hValue.rh_get(:readonly) || hValue.rh_get(:get) == false
         s_desc = hValue.rh_get(:desc)
         puts format('%-15s %-12s : %s', found_key, section, s_desc)
       end
@@ -255,12 +267,20 @@ module Forj
       false
     end
 
+    # Function to highlight the data origin
+    # => yellow : account
+    # => white  : local config
+    # => normal : all other config
+    #
+    #
     def self.format_highlight(account_name, config_where, where_format)
-      return format(where_format, config_where) if config_where == 'default'
+      res = format(where_format, 'default')
+      return res unless config_where == 'local' || config_where == 'account'
+
+      res = ANSI.bold(format(where_format, config_where))
+      return res if config_where == 'local'
 
-      return ANSI.bold(format(where_format,
-                              account_name)) if config_where == 'account'
-      ANSI.bold(ANSI.yellow(format(where_format, config_where)))
+      ANSI.yellow(ANSI.bold(format(where_format, account_name)))
     end
 
     def self.get_account_values(account, account_name)
@@ -285,18 +305,13 @@ module Forj
                       s_upd_msg, mykey, where_highlight, section,
                       account.get(mykey, nil, :section => section), default_key)
         else
-          puts format(
-            '%s %-15s(         ) %-12s: unset',
-            s_upd_msg,
-            mykey,
-            section
-          )
+          puts format('%s %-15s(         ) %-12s: unset',
+                      s_upd_msg, mykey, section)
         end
       end
     end
 
     def self.account_get_all(oConfig, account_name)
-      #  byebug
       PrcLib.fatal(1, "Unable to load account '%s'. Not found.",
                    account_name) unless oConfig.ac_load account_name
       Forj::CloudConnection.connect(oConfig)

data/lib/process/forj_core/data.yaml

@@ -151,7 +151,7 @@
       :required:           true
       :ask_sort:           0
       :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#auth_uri']:nil %>"
-      :validate:           !ruby/regexp /v2.0\/tokens/
+      :validate:           !ruby/regexp /^http.*v2.0\/tokens$/
       :ask_step:           :gardener_config
 
 
@@ -176,6 +176,10 @@
          :pre_step_function:  :forj_dns_settings?
          :ask_step:           :dns_config
 
+  :network:
+    :webproxy:
+      :desc:            "HTTP/HTTPS proxy setting to access internet from your cloud"
+
   # Defines maestro environment.
   :maestro:
     :tenant_name:
@@ -280,16 +284,16 @@
   # As forj_core is based on lorj_cloud, we have to disable Lorj_cloud data defaults.
   :server:
     :network_name:
-      :set:             false
+      :get:             false
     :security_group:
-      :set:             false
+      :get:             false
     :box_name:
-      :set:             false
+      :get:             false
     :flavor_name:
-      :set:             false
+      :get:             false
       :account:         false
     :image_name:
       :account:         false
-      :set:             false
+      :get:             false
     :ports:
-      :set:             false
+      :get:             false

data/lib/process/forj_core/process/ca_root_cert.rb

@@ -93,7 +93,7 @@ class ForjCoreProcess
     if res_found
       dest_file = "#{res_found[2]}"
     else
-      dest_file = File.basename(cert_file)
+      dest_file = File.basename(hParams['certs#ca_root_cert'])
     end
 
     metadata['CA_ROOT_CERT'] = dest_file

data/lib/process/forj_core/process/declare.rb

@@ -65,6 +65,7 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   obj_needs :data,   'credentials#auth_uri'
   obj_needs_optional
 
+  obj_needs :data,   'network#webproxy'
   # If requested by user, ask Maestro to manage the DNS.
   obj_needs :data,   'dns#dns_service'
   obj_needs :data,   'dns#dns_tenant_id'

data/lib/process/forj_core/process/forj_process.rb

@@ -625,6 +625,7 @@ DNS_SECRET='#{hParams['credentials#account_key']}'
 
     tb_metadata(hParams, h_meta)
     ca_root_metadata(hParams, h_meta)
+    proxy_metadata(hParams, h_meta)
 
     h_meta
   end
@@ -1473,8 +1474,6 @@ class ForjCoreProcess
     begin
       PrcLib.state("creating ssh connection with '%s' box", o_server[:name])
       ssh_login(ssh_options, user, public_ip)
-      PrcLib.debug('Error closing ssh connection, box %s ',
-                   o_server[:name]) unless session
    rescue => e
      PrcLib.fatal 1, <<-END
 #{e.message}

data/lib/process/forj_core/process/proxy.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+# (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.
+
+# Functions for test-box
+class ForjCoreProcess
+  # This function configure the proxy metadata
+  def proxy_metadata(hParams, metadata)
+    return unless hParams.exist?('network#webproxy')
+
+    metadata['webproxy'] = hParams['network#webproxy']
+  end
+end

data/lib/process/forj_core_process.rb

@@ -19,7 +19,7 @@ FORJCORE_PATH = File.expand_path(File.dirname(__FILE__))
 
 # Define model
 
-lorj_objects = %w(forj_process test_box ca_root_cert declare)
+lorj_objects = %w(forj_process test_box ca_root_cert proxy declare)
 
 lorj_objects.each do |name|
   load File.join(FORJCORE_PATH, 'forj_core', 'process', name + '.rb')

data/lib/ssh.rb

@@ -38,21 +38,13 @@ module Forj
 
       if o_forge[:servers].count > 0
         if account[:box_ssh]
-          o_server = validate_server_name(name, account, o_forge)
+          server = validate_server_name(name, account[:box_ssh], o_forge)
 
-          if !o_server.nil?
-            ssh_connection(account, o_cloud, name, o_server)
-          else
-            PrcLib.debug("server '%s.%s' was not found",
-                         account[:box_ssh], name)
-            PrcLib.high_level_msg("server '%s.%s' was not found.\n",
-                                  account[:box_ssh], name)
-          end
+          return if server.nil?
         else
           server = select_forge_server(o_forge)
-
-          ssh_connection(account, o_cloud, name, server)
         end
+        ssh_connection(account, o_cloud, name, server)
       else
         PrcLib.high_level_msg("No server(s) found for instance name '%s' \n",
                               name)
@@ -85,20 +77,14 @@ module Forj
       o_cloud.create(:ssh, :server => server)
     end
 
-    def self.validate_server_name(name, account, o_forge)
-      box_ssh = account[:box_ssh]
-
-      o_server = nil
-      regex =  Regexp.new(format('%s\.%s$', box_ssh, name))
-
-      o_forge[:servers].each do |server|
-        o_name = server[:name]
-        next if (regex =~ o_name).nil?
-        o_server = server
-        break
+    def self.validate_server_name(name, box_ssh, o_forge)
+      unless o_forge[:servers].key?(box_ssh)
+        PrcLib.debug("server '%s.%s' was not found", box_ssh, name)
+        PrcLib.high_level_msg("server '%s.%s' was not found.\n", box_ssh, name)
+        return
       end
 
-      o_server
+      o_forge[:servers][box_ssh]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -211,6 +211,7 @@ files:
 - lib/process/forj_core/process/ca_root_cert.rb
 - lib/process/forj_core/process/declare.rb
 - lib/process/forj_core/process/forj_process.rb
+- lib/process/forj_core/process/proxy.rb
 - lib/process/forj_core/process/test_box.rb
 - lib/process/forj_core_process.rb
 - lib/ssh.rb