forj 0.0.40 → 0.0.41

data/lib/boot.rb

@@ -34,11 +34,10 @@ include Helpers
 # Boot module
 #
 module Boot
-  def boot(blueprint, name, build, build_config,
-      branch, boothook, box_name, oConfig)
+  def boot(blueprint, name, build, branch, boothook, box_name, oConfig)
     begin
 
-      Logging.fatal(1, 'FORJ account not specified. Did you used `forj setup`, before?') if not oConfig.get('account_name')
+      Logging.fatal(1, 'FORJ account not specified. Did you used `forj setup`, before?') if not oConfig.get(:account_name)
 
       oForjAccount = ForjAccount.new(oConfig)
 
@@ -46,11 +45,11 @@ module Boot
 
 
       # Load Forj account data
-      forjAccountFile = File.join($FORJ_ACCOUNTS_PATH, oConfig.get('account_name'))
-      oConfig.ExtraLoad(forjAccountFile, :forj_accounts, oConfig.get('account_name'))
+      forjAccountFile = File.join($FORJ_ACCOUNTS_PATH, oConfig.get(:account_name))
+      oConfig.ExtraLoad(forjAccountFile, :forj_accounts, oConfig.get(:account_name))
 
       # Check options and set data
-      cloud_provider = oForjAccount.get(:account, :provider, 'hpcloud')
+      cloud_provider = oForjAccount.getAccountData(:account, :provider, 'hpcloud')
 
       if cloud_provider != 'hpcloud'
          Logging.fatal(1, "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider)
@@ -60,14 +59,14 @@ module Boot
       Logging.high_level_msg(initial_msg) #################
 
       # Initialize defaults
-      maestro_url =  oConfig.get('maestro_url')
+      maestro_url =  oConfig.get(:maestro_url)
+
+      infra_dir = File.expand_path(oForjAccount.get(:infra_repo))
 
-      infra_dir = File.expand_path(oConfig.get('infra_repo'))
-      
 
       # Check about infra repo compatibility with forj cli
       bBuildInfra = Repositories.infra_rebuild_required?(oConfig, infra_dir)
-      
+
       # Ask information if needed.
       if not Dir.exist?(File.expand_path(infra_dir))
          sAsk = 'Your \'%s\' infra directory doesn\'t exist. Do you want to create a new one from Maestro(repo github)/templates/infra (yes/no)?' % [infra_dir]
@@ -76,18 +75,18 @@ module Boot
          Logging.info('Re-using your infra... in \'%s\'' % [infra_dir]) if not bBuildInfra
       end
       if not Dir.exist?(File.expand_path(infra_dir)) and not bBuildInfra
-         Logging.info ('Exiting.')
+         Logging.info('Exiting.')
          return
       end
 
       # Get FORJ DNS setting
       yDNS = rhGet(oForjAccount.hAccountData, :dns)
-      Logging.fatal(1, "DNS or domain name are missing. Please execute forj setup %s" % oForjAccount.get(:account, 'name')) if not yDNS
+      Logging.fatal(1, "DNS or domain name are missing. Please execute forj setup %s" % oForjAccount.getAccountData(:account, 'name')) if not yDNS
 
-      branch = oConfig.get('branch') unless branch
+      branch = oConfig.get(:branch) unless branch
 
       # Step Maestro Clone
-      if not oConfig.get(:maestro_repo)
+      if not oForjAccount.get(:maestro_repo)
          Logging.info('cloning maestro repo from \'%s\'...' % maestro_url)
          Repositories.clone_repo(maestro_url)
          maestro_repo=File.expand_path('~/.forj/maestro')
@@ -107,26 +106,26 @@ module Boot
       # Connect to services
       oFC=ForjConnection.new(oConfig)
 
-      Logging.info('Configuring network \'%s\'' % [oConfig.get('network')])
+      Logging.info('Configuring network \'%s\'' % [oForjAccount.get('network')])
       begin
-        network = Network.get_or_create_network(oFC, oConfig.get('network'))
+        network = Network.get_or_create_network(oFC, oForjAccount.get('network'))
         subnet = Network.get_or_create_subnet(oFC, network.id, network.name)
-        router = Network.get_or_create_router(oFC, network, subnet)
+        Network.get_or_create_router(oFC, network, subnet)
       rescue => e
         Logging.fatal(1, "Network properly configured is required.", e)
       end
 
-      Logging.info('Configuring keypair \'%s\'' % [oForjAccount.get(:credentials, 'keypair_name')])
+      Logging.info('Configuring keypair \'%s\'' % [oForjAccount.get('keypair_name')])
       SecurityGroup.hpc_import_key(oForjAccount)
 
 
-      Logging.info('Configuring Security Group \'%s\'' % [oConfig.get('security_group')])
-      security_group = SecurityGroup.get_or_create_security_group(oFC, oConfig.get('security_group'))
-      ports = oConfig.get('ports')
+      Logging.info('Configuring Security Group \'%s\'' % [oForjAccount.get('security_group')])
+      security_group = SecurityGroup.get_or_create_security_group(oFC, oForjAccount.get('security_group'))
+      ports = oConfig.get(:ports)
 
       ports.each do |port|
         port = port.to_s if port.class != String
-        if not /^\d+(-\d+)?$/ =~ port
+        if not (/^\d+(-\d+)?$/ =~ port)
            Logging.error("Port '%s' is not valid. Must be <Port> or <PortMin>-<PortMax>" % [port])
         else
            mPortFound = /^(\d+)(-(\d+))?$/.match(port)
@@ -136,19 +135,25 @@ module Boot
         end
       end
 
+      # oForjAccount data get are retrieved from the account file under section described in defaults.yaml, as soon as this mapping exist.
+      # If not found, get the data from the local configuration file. Usually ~/.forj/config.yaml
+      # If not found, get the data from defaults.yaml
+      # otherwise, use the get default parameter as value. Default is nil.
+
+
       oBuildEnv = BuildEnv.new(oConfig)
       ENV['FORJ_CLI_ENV'] = oBuildEnv.sBuildEnvFile
       oBuildEnv.set('FORJ_HPC',             oFC.sAccountName)
       oBuildEnv.set('FORJ_HPC_NET',         network.name)
-      oBuildEnv.set('FORJ_SECURITY_GROUP',  oForjAccount.get(:maestro,    'security_group'))
-      oBuildEnv.set('FORJ_KEYPAIR',         oForjAccount.get(:credentials,'keypair_name'))
-      oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oForjAccount.get(:credentials,'keypair_path') + '.pub')
-      oBuildEnv.set('FORJ_BASE_IMG',        oForjAccount.get(:maestro,    'image'))
-      oBuildEnv.set('FORJ_FLAVOR',          oForjAccount.get(:maestro,    'flavor'))
-      oBuildEnv.set('FORJ_BP_FLAVOR',       oForjAccount.get(:maestro,    'bp_flavor'))
-      oBuildEnv.set('FORJ_TENANT_NAME',     oForjAccount.get(:compute,    :tenant_name))
+      oBuildEnv.set('FORJ_SECURITY_GROUP',  oForjAccount.get('security_group'))
+      oBuildEnv.set('FORJ_KEYPAIR',         oForjAccount.get('keypair_name'))
+      oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oForjAccount.get('keypair_path') + '.pub')
+      oBuildEnv.set('FORJ_BASE_IMG',        oForjAccount.get('image'))
+      oBuildEnv.set('FORJ_FLAVOR',          oForjAccount.get('flavor'))
+      oBuildEnv.set('FORJ_BP_FLAVOR',       oForjAccount.get('bp_flavor'))
+      oBuildEnv.set('FORJ_TENANT_NAME',     oForjAccount.get(:tenant_name))
       oBuildEnv.set('FORJ_HPC_COMPUTE',     rhGet(oConfig.ExtraGet(:hpc_accounts,  oFC.sAccountName, :regions), :compute))
-      
+
 
       oBuildEnv.set('FORJ_DOMAIN', yDNS[:domain_name])
 
@@ -163,8 +168,8 @@ module Boot
 
       build = 'bin/build.sh' unless build
 
-      build_config = oConfig.get('build_config')
-      box_name = oConfig.get('box_name')
+      build_config = oForjAccount.get('build_config')
+      box_name =     oForjAccount.get('box_name')
 
       arg = '--meta blueprint=%s ' % [blueprint]
       arg += "--test-box '%s' " % oConfig.get(:test_box) if oConfig.exist?(:test_box)
@@ -201,14 +206,14 @@ end
 class BuildEnv
 
    attr_reader :sBuildEnvFile
-   
+
    def initialize(oConfig)
 
-      oConfig.fatal_if_inexistent('infra_repo')
-      oConfig.fatal_if_inexistent('account_name')
+      oConfig.fatal_if_inexistent(:infra_repo)
+      oConfig.fatal_if_inexistent(:account_name)
 
-      sBuildDir = File.expand_path(File.join(oConfig.get('infra_repo'),'build'))
-      @sBuildEnvFile = File.join(sBuildDir, oConfig.get('account_name')+'.build.env')
+      sBuildDir = File.expand_path(File.join(oConfig.get(:infra_repo),'build'))
+      @sBuildEnvFile = File.join(sBuildDir, oConfig.get(:account_name)+'.build.env')
       Helpers.ensure_dir_exists(sBuildDir)
       @yBuildEnvVar = {}
       @oConfig = oConfig

data/lib/compute.rb

@@ -16,7 +16,6 @@
 #    limitations under the License.
 
 require 'rubygems'
-require 'require_relative'
 
 #
 # compute module
@@ -24,10 +23,14 @@ require 'require_relative'
 module Compute
   def delete_forge(oFC, name)
     instances = oFC.oCompute.servers.all(:name => name)
+    iCount = 0
     instances.each do|instance|
       # make sure we don't delete another forge because fog filters
       # the name in a "like syntax" way
+      Logging.debug("Removing '%s'" % [instance.id])
       oFC.oCompute.servers.get(instance.id).destroy
+      iCount += 1
     end
+	Logging.message("Forge: %s - %d servers removed" % [name, iCount])
   end
 end

data/lib/connection.rb

@@ -37,7 +37,7 @@ class ForjConnection
      Logging.fatal(1, 'Internal Error: Missing global $HPC_ACCOUNTS') if not $HPC_ACCOUNTS
      
      @oConfig = oConfig
-     @sAccountName = @oConfig.get('account_name')
+     @sAccountName = @oConfig.get(:account_name)
      @provider='HP' # TODO: Support multiple provider. (Generic Provider object required)
      @sAccountName = @oConfig.get(:provider) if not @sAccountName
      @sAccountName = 'hpcloud' if not @sAccountName

data/lib/defaults.yaml

@@ -12,47 +12,109 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-default:
-  maestro_url: https://github.com/forj-oss/maestro.git
+:default:
+  :maestro_url: https://github.com/forj-oss/maestro.git
 
   # Default Infra repository to use. If missing, it will be proposed to be created.
-  infra_repo: ~/.forj/infra
-  
+  :infra_repo: ~/.forj/infra
+
   # You can set proto2b in your ~/.forj/config.yaml if you built it from maestro/build. Read the maestro/README.md to create it.
-  image: Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)
-  
+  :image: Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)
+
   # Flavor to use for Maestro
-  flavor: standard.medium
+  :flavor: standard.medium
   # Default flavor to use for all Blueprint nodes.
-  bp_flavor: standard.small
-  
+  :bp_flavor: standard.small
+
   # Ports to open for Maestro, added to the security group
-  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]
-  
+  :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_path: ~/.ssh/forj-id_rsa 
-  keypair_name: forj
+  :keypair_path: ~/.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
+  :network: forj
 
-  # build.sh internal variables.  
-  build_config: box
-  branch: master
-  box_name: maestro
+  # build.sh internal variables.
+  :build_config: box
+  :branch: master
+  :box_name: maestro
 :description:
   # Description of build.sh environment variable defined by forj cli for build.sh. (~/.forj/infra/build/<Account>.build.env)
-  FORJ_HPC:             "HPCloud cli Account used to build your Maestro box"
-  FORJ_HPC_COMPUTE:     "HPCloud Compute service (like region-b.geo-1) used to run your Maestro Box"
-  FORJ_TENANT_NAME:     "HPCloud Tenant name used build your <Blueprint> nodes"
-  FORJ_HPC_NET:         "HPCloud Network name to use, while booting all boxes."
-  FORJ_KEYPAIR:         "Keypair used to access boxes."
-  FORJ_SECURITY_GROUP:  "Security group associated to each box"
-  FORJ_HPC_NOVA_KEYPUB: "Public key used by build.sh to ensure his existence on HPCloud"
-  FORJ_BASE_IMG:        "Base image used to build all boxes"
-  FORJ_FLAVOR:          "Flavor used to build Maestro"
+  :FORJ_HPC:             "HPCloud cli Account used to build your Maestro box"
+  :FORJ_HPC_COMPUTE:     "HPCloud Compute service (like region-b.geo-1) used to run your Maestro Box"
+  :FORJ_TENANT_NAME:     "HPCloud Tenant name used build your <Blueprint> nodes"
+  :FORJ_HPC_NET:         "HPCloud Network name to use, while booting all boxes."
+  :FORJ_KEYPAIR:         "Keypair used to access boxes."
+  :FORJ_SECURITY_GROUP:  "Security group associated to each box"
+  :FORJ_HPC_NOVA_KEYPUB: "Public key used by build.sh to ensure his existence on HPCloud"
+  :FORJ_BASE_IMG:        "Base image used to build all boxes"
+  :FORJ_FLAVOR:          "Flavor used to build Maestro"
   # DNS specific data
-  FORJ_DNS_TENANTID:    "HPCloud Project ID to use to create DNS entries for each boxes."
-  FORJ_DNS_ZONE:        "HPCloud Domain name service to use for each boxes DNS entries. (Ex: region-a.geo-1)"
-  FORJ_DNS_DOMAIN:      "Domain used for DNS. Each server will be attached to a public IP. An 'A' record in the DNS service will need to be added to your HPCloud DOMAIN."
+  :FORJ_DNS_TENANTID:    "HPCloud Project ID to use to create DNS entries for each boxes."
+  :FORJ_DNS_ZONE:        "HPCloud Domain name service to use for each boxes DNS entries. (Ex: region-a.geo-1)"
+  :FORJ_DNS_DOMAIN:      "Domain used for DNS. Each server will be attached to a public IP. An 'A' record in the DNS service will need to be added to your HPCloud DOMAIN."
+
+# Use by Object ForjAccount, function get, to identify the section name in ~/.forj/accounts/YourAccount. We can set those variables with 'forj set key=value [-a account]'
+:account_section_mapping:
+  :security_group:
+    :section:     :maestro
+    :desc:        "Security group name to configure and attach to each forge boxes."
+
+  :image:
+    :section:    :maestro
+    :desc:       "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)'"
+
+  :flavor:
+    :section:    :maestro
+    :desc:       "Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs."
+
+  :bp_flavor:
+    :section:    :maestro
+    :desc:       "Blueprint nodes default flavor. Usually, blueprint node are smaller than Maestro."
+
+  :build_config:
+    :section:    :maestro
+    :desc:       "forj cli use 'build.sh' to create Maestro. See build_config option on build.sh to get more information. By default 'box'"
+
+  :box_name:
+    :section:    :maestro
+    :desc:       "forj cli use 'build.sh' to create Maestro. See box_name option on build.sh to get more information. By default 'maestro'"
+
+  :keypair_name:
+    :section:    :credentials
+    :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."
+
+  :keypair_path:
+    :section:    :credentials
+    :desc:       "public key file to send to the cloud under keypair name, and private key to keep on your local forj environment to access your boxes."
+
+  :tenant_name:
+    :section:    :compute
+    :desc:       "Tenant name required by fog/openstack on gardener"
+
+  :domain_name:
+    :section:    :dns
+    :desc:       "Domain name added to each hosts."
+
+  :tenant_id:
+    :section:    :dns
+    :desc:       "DNS Tenant ID Maestro will use"
+
+  :service:
+    :section:    :dns
+    :desc:       "DNS service region name Maestro will use."
+
+  :network:
+    :section:    :network
+    :desc:       "Network name to attach to each forge boxes. By default we use 'private'. If it doesn't exist, it will be created."
+    
+  :infra_repo:
+    :section:    :maestro
+    :desc:       "Defines your Infra directory to use while booting."
+  
+  :maestro_repo:
+    :section:    :maestro
+    :desc:       "To use a different Maestro repository already cloned."

data/lib/down.rb

@@ -35,21 +35,23 @@ include Compute
 # Down module
 #
 module Down
-  def down(oFC, name)
+  def down(oConfig, name)
     begin
 
       initial_msg = 'deleting forge "%s"' % [name]
       Logging.info(initial_msg)
 
-      Compute.delete_forge(name)
+      oFC=ForjConnection.new(oConfig)
 
-      router = Network.get_router(oFC, 'private-ext')
-      subnet = Network.get_subnet(oFC, name)
-      Network.delete_router_interface(subnet.id, router)
+      Compute.delete_forge(oFC, name)
 
-      Network.delete_subnet(oFC, subnet.id)
-      network = Network.get_network(oFC, name)
-      Network.delete_network(oFC, network.name)
+      #~ router = Network.get_router(oFC, 'private-ext')
+      #~ subnet = Network.get_subnet(oFC, name)
+      #~ Network.delete_router_interface(subnet.id, router)
+#~ 
+      #~ Network.delete_subnet(oFC, subnet.id)
+      #~ network = Network.get_network(oFC, name)
+      #~ Network.delete_network(oFC, network.name)
 
     rescue SystemExit, Interrupt
       Logging.error('process interrupted by user')

data/lib/forj-account.rb

@@ -33,6 +33,18 @@ require 'hpcloud/accounts'
 require 'hpcloud/connection'
 include HP::Cloud
 
+class ForjAccounts
+   # Class to query FORJ Accounts list.
+   def initialize()
+   end
+
+   def dump()
+      aAccounts=[]
+      Dir.foreach($FORJ_ACCOUNTS_PATH) { |x| aAccounts << x if not x.match(/^\..?$/) }
+      aAccounts
+   end
+end
+
 class ForjAccount
 
    attr_reader :sAccountName
@@ -44,8 +56,8 @@ class ForjAccount
       # Initialize object
       @oConfig = oConfig
 
-      if @oConfig.get('account_name')
-         @sAccountName = @oConfig.get('account_name')
+      if @oConfig.get(:account_name)
+         @sAccountName = @oConfig.get(:account_name)
       else
          @sAccountName = 'hpcloud'
       end
@@ -59,9 +71,53 @@ class ForjAccount
       rhSet(@hAccountData, sProvider, [:account, :provider]) if rhExist?(@hAccountData, [:account, :provider]) != 2
    end
 
-   def get(section, key, default = nil)
-      @oConfig.get(key, rhGet(@hAccountData, section), default )
-	end
+   # oForjAccount data get are retrieved from the account file under section described in defaults.yaml (:account_section_mapping), as soon as this mapping exists.
+   # If not found, get the data from the local configuration file. Usually ~/.forj/config.yaml
+   # If not found, get the data from defaults.yaml
+   # otherwise, use the get default parameter as value. Default is nil.
+   def get(key, default = nil)
+      return nil if not key
+
+      key = key.to_sym if key.class == String
+      section = rhGet(@oConfig.getAppDefault(:account_section_mapping, key), :section)
+      yInterm = nil
+      yInterm = rhGet(@hAccountData, section) if section
+      @oConfig.get(key, yInterm , default )
+   end
+
+   def exist?(key)
+      return nil if not key
+
+      key = key.to_sym if key.class == String
+      section = rhGet(@oConfig.getAppDefault(:account_section_mapping, key), :section)
+      yInterm = nil
+      yInterm = rhGet(@hAccountData, section) if section
+      @oConfig.exist?(key, yInterm)
+
+   end
+
+   def set(key, value)
+      return nil if not key
+
+      key = key.to_sym if key.class == String
+      section = rhGet(@oConfig.getAppDefault(:account_section_mapping, key), :section)
+      return nil if not section
+      rhSet(@hAccountData, value, section, key)
+   end
+
+   def del(key)
+      return nil if not key
+
+      key = key.to_sym if key.class == String
+      section = rhGet(@oConfig.getAppDefault(:account_section_mapping, key), :section)
+      return nil if not section
+      rhSet(@hAccountData, nil, section, key)
+   end
+
+   def getAccountData(section, key, default=nil)
+      return rhGet(@hAccountData, section, key) if rhExist?(@hAccountData, section, key) == 2
+      default
+   end
 
    def ac_load(sAccountName = @sAccountName)
       # Load Account Information
@@ -73,15 +129,24 @@ class ForjAccount
 
       if File.exists?(@sAccountFile)
          @hAccountData = @oConfig.ExtraLoad(@sAccountFile, :forj_accounts, @sAccountName)
+         # Check if hAccountData are using symbol or needs to be updated.
          sProvider = @oConfig.get(:provider, nil, 'hpcloud')
          rhSet(@hAccountData, @sAccountName, :account, :name) if rhExist?(@hAccountData, :account, :name) != 2
          rhSet(@hAccountData, sProvider, :account, :provider) if rhExist?(@hAccountData, :account, :provider) != 2
          provider_load()
+         if rhKeyToSymbol?(@hAccountData, 2)
+            @hAccountData = rhKeyToSymbol(@hAccountData, 2) 
+            self.ac_save()
+         end
          return @hAccountData
       end
       nil
    end
 
+   def dump()
+      { :forj_account => @hAccountData, :hpc_account => provider_load() }
+   end
+
    def ac_save()
       @oConfig.ExtraSet(:forj_accounts, @sAccountName, nil, @hAccountData)
       @oConfig.ExtraSave(@sAccountFile, :forj_accounts, @sAccountName)
@@ -109,7 +174,7 @@ class ForjAccount
 
       # Checking cloud connection
       Logging.message("Checking cloud connection")
-      oFC = ForjConnection.new(@oConfig)
+      ForjConnection.new(@oConfig)
 
       Logging.message("Setup '%s' done. Thank you." % @sAccountName)
    end
@@ -135,7 +200,7 @@ class ForjAccount
       end
 
       provider_load() # To ensure latest provider data are loaded
-      
+
       setup_tenant_name()
    end
 
@@ -148,10 +213,9 @@ class ForjAccount
       @oConfig.ExtraLoad(hpc_account_file, :hpc_accounts, @sAccountName)
    end
 
+   # Maestro uses fog/openstack to connect to the cloud. It needs Tenant name instead of tenant ID.
+   # Getting it from Compute connection and set it
    def setup_tenant_name()
-      # Maestro uses fog/openstack to connect to the cloud. It needs Tenant name instead of tenant ID.
-      # Getting it from Compute connection and set it
-
       oSSLError=SSLErrorMgt.new # Retry object
       Logging.debug("Getting tenants from hpcloud cli libraries")
       begin
@@ -186,7 +250,7 @@ class ForjAccount
       sAsk = "Optionally, you can ask Maestro to use/manage a domain name on your cloud. It requires your DNS cloud service to be enabled.\nDo you want to configure it?"
       if agree(sAsk)
          # Getting tenants
-         tenants = @oConfig.get('tenants')
+         tenants = @oConfig.get(:tenants)
 
          # Question about DNS Tenant ID
          # In HPCloud : credentials/tenant_id
@@ -248,12 +312,12 @@ class ForjAccount
 
       # Getting Account keypair information
       yCreds = rhGet(@hAccountData, :credentials)
-      key_name = @oConfig.get('keypair_name', yCreds )
-      orig_key_path = File.expand_path(@oConfig.get('keypair_path', yCreds))
-      
+      key_name = @oConfig.get(:keypair_name, yCreds )
+      orig_key_path = File.expand_path(@oConfig.get(:keypair_path, yCreds))
+
       Logging.warning("'keypair_path' is missing at least from defaults.yaml. To fix it, set it in your configuration file ~/.forj/config.yaml under default section") if not orig_key_path
       key_path = nil
-      while not key_path 
+      while not key_path
          key_path = ask ("Please provide the SSH private key path used by default on this account:") do | q |
             q.default = orig_key_path
             q.validate = /.*+/
@@ -285,7 +349,7 @@ class ForjAccount
          q.validate = /.*+/
       end
       key_name = key_name.to_s
-      
+
       keys = keypair_detect(key_name, key_path)
 
       Logging.info("Configuring forj keypair '%s'" % [ keys[:keypair_name] ] )
@@ -334,7 +398,7 @@ class ForjAccount
       if keys[:keypair_path] != $FORJ_KEYPAIRS_PATH
          if not File.exists?(forj_private_key_file)
             Logging.info("Importing key pair to FORJ keypairs list.")
-            FileUtils.copy(private_key_file, forj_private_key_file) 
+            FileUtils.copy(private_key_file, forj_private_key_file)
             FileUtils.copy(public_key_file, forj_public_key_file)
             # Attaching this keypair to the account
             rhSet(@hAccountData, key_name, :credentials, 'keypair_name')
@@ -385,7 +449,7 @@ class ForjAccount
          hpcloud_os_key_hidden = '*' * Encryptor.decrypt(
              :value => Base64::strict_decode64(enc_hpcloud_os_key),
              :key   => entr[:key],
-             :iv    => entr[:iv], 
+             :iv    => entr[:iv],
              :salt  => entr[:salt]
             ).length
          hpcloud_os_key_hidden="[%s]" % hpcloud_os_key_hidden
@@ -403,10 +467,10 @@ class ForjAccount
          if hpcloud_os_key == "" and enc_hpcloud_os_key
             hpcloud_os_key = Encryptor.decrypt(:value => Base64::strict_decode64(enc_hpcloud_os_key), :key => entr[:key], :iv => entr[:iv], :salt => entr[:salt])
          else
-            Logging.message("The password cannot be empty.") if hpcloud_os_key == "" 
+            Logging.message("The password cannot be empty.") if hpcloud_os_key == ""
          end
       end
-      enc_hpcloud_os_key = Base64::strict_encode64(Encryptor.encrypt(:value => hpcloud_os_key, :key => entr[:key], :iv => entr[:iv], :salt => entr[:salt])) 
+      enc_hpcloud_os_key = Base64::strict_encode64(Encryptor.encrypt(:value => hpcloud_os_key, :key => entr[:key], :iv => entr[:iv], :salt => entr[:salt]))
 
       cloud_fog = File.join($FORJ_CREDS_PATH, @sAccountName+'.g64')