forj 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b917ad8fea682fd2f00aeb9dfddd87e27622cc
-  data.tar.gz: 6fb1f8bf1b18491b9f73dc4134b3b7f3b69bd295
+  metadata.gz: bf55692c422122d563704df71be87e18427bcdf2
+  data.tar.gz: ffc9da6135f46720256dbabb3f8a9bf277a3d848
 SHA512:
-  metadata.gz: be0dcbadd3c1582763998fc3d847b15245ea7b922d6d00c7845e2bab06cc1ac22d65780edcbf28d7ab09cc6e22907f76cd2337431d21e8d69b9c5f43d2b4ddd9
-  data.tar.gz: ff78c34bb6d96b0b49ba9dbc5742f96565ae28912b18b03fdc39423baf2db4fa5ffc38728afda0ee7d69fa0c3e042fd4380ae87323da03b0a282d60ac56e10d5
+  metadata.gz: 29d4e63ea42e92a8b2225a550146e692afd76b95911a1d74ae257e1c5823483473774b3e5d1e3049f02bb2f189dac8a35a1f8ec32d8a2d52f55aa7f99b19730d
+  data.tar.gz: 3a39d5dd6bed1d7cc75607e726625979a37dda94b59f337105b9479cf37228efff4bac5cd15442b1686b2e45fb5e815c18da326e82e7deaa4841f173fffc4dac

data/Gemfile

@@ -16,10 +16,15 @@
 #    limitations under the License.
 
 source 'https://rubygems.org'
+group(:development, :test) do
+  gem 'rake'
+  gem 'debugger'
+  gem 'rspec', "~> 2.10.0", :require => false
+end
 
 gem 'mime-types','1.25.1'
-gem 'excon','0.33.0'
-gem 'json'
+gem 'excon','0.31.0'
+gem 'json','~>1.7.5'
 gem 'nokogiri','1.5.11'
 gem 'fog', '1.19.0'
 gem 'git', '>=1.2.7'
@@ -27,3 +32,7 @@ gem 'rainbow'
 gem 'rbx-require-relative', '~> 0.0.7'
 gem 'thor', '>=0.16.0'
 gem 'hpcloud', '~>2.0.8'
+gem 'highline','>=1.6.21'
+gem 'ansi','>=1.4.3'
+gem 'encryptor','>=1.3.0'
+

data/README.md

@@ -16,13 +16,14 @@ Installation
 
 **For ruby 1.9**
 
-    $ sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev libxml2-dev libxslt-dev git -y
+    $ 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 -y
+    $ 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
@@ -31,6 +32,18 @@ Installation
     $ sudo gem install hpcloud
     $ sudo gem install forj
 
+**Installation from source**
+Perform one of the ruby installation steps without `gem install forj`.
+
+    $ sudo apt-get -y install build-essential make libxslt-dev libxml2-dev
+    $ sudo mkdir -p /opt/config/production/git
+    $ cd /opt/config/production/git
+    $ git clone https://review.forj.io/forj-oss/cli
+    $ cd cli
+    $ gem install bundler --no-rdoc --no-ri
+    $ gem install rake --no-rdoc --no-ri
+    $ bundle install --gemfile Gemfile
+    $ rake install
 
 Quick steps: How to create a forj?
 ----------------------------------
@@ -39,16 +52,17 @@ Quick steps: How to create a forj?
 
 1.  Setup your first forj account.
 
-    `$ forj setup [Provider]`
+    `$ forj setup [AccountName]`
 
-    Ex: `forj setup hpcloud`. In this example, your account will be named 'hpcloud'.
+    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.
 
 2.  Create your forge on your default account
 
-    `$ forj boot <blueprint> on hpcloud as <InstanceName>`
+    `$ forj boot <blueprint> <InstanceName>`
 
-    Ex: `forj boot redstone on hpcloud as MyForge`
+    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.
 
 
 ###Forj options:
@@ -64,11 +78,11 @@ To get help on specific action, just type:
  Examples of possible actions:
 
 Commands:
-  forj boot <Blueprint> on <Provider> as <InstanceName> [options]  # boot a Maestro box and instruct it to provision the blueprint
-  forj down                                                        # delete the Maestro box and all systems installed by the blueprint
-  forj help [action]                                               # Describe available FORJ actions or one specific action
-  forj setup                                                       # set the credentials for forj cli
-  forj show defaults                                               # Show list of predefined value you can update in your ~/.forj/config.yaml
+  forj boot <Blueprint> <InstanceName> [options] # boot a Maestro box and instruct it to provision the blueprint
+  forj down                                      # delete the Maestro box and all systems installed by the blueprint
+  forj help [action]                             # Describe available FORJ actions or one specific action
+  forj setup                                     # set the credentials for forj cli
+  forj show defaults                             # Show list of predefined value you can update in your ~/.forj/config.yaml
   forj ssh 
 
 
@@ -84,12 +98,12 @@ Here are the variables list you can set:
        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         # NOT CURRENTLY USED. Still under development.
-                                # 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)'
+       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       # NOT CURRENTLY USED. Still under development.
-                                # Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs.
-                                # By default: standard.xsmall
+       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.

data/Rakefile

@@ -15,9 +15,14 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-
+require 'rubygems'
+require 'bundler/setup'
 require 'rspec/core/rake_task'
 
+$stdout.sync = true
+$stderr.sync = true
+Bundler::GemHelper.install_task
+
 task :default => [:spec]
 
 desc 'Run the specs.'

data/bin/forj

@@ -36,6 +36,7 @@ include Setup
 include Ssh
 
 require 'forj-config.rb' # Load class ForjConfig
+require 'forj-account.rb' # Load class ForjAccount
 require 'log.rb' # Load default loggers
 require 'connection.rb' # Load class ForjConnection
 
@@ -67,18 +68,21 @@ class Forj < Thor
 Quick steps: How to create a forj?
 ----------------------------------
 
-1.  Setup your first forj account.
-    `$ forj setup [Provider]`
+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)
 
-    Ex: `forj setup hpcloud`. In this example, your account will be named 'hpcloud'.
+1.  Setup your FORJ account.
+    `$ forj setup [AccountName] [--provider Provider]`
 
-IMPORTANT NOTE: Without any provider, forj setup will choose 'hpcloud' as provider.
-                Currently, forj supports only hpcloud. Openstack will be available soon.
+    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.
+
+**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!
 
 2.  Create your forge on your default account
-    `$ forj boot <blueprint> on <Provider> as <InstanceName> `
+    `$ forj boot <blueprint> <InstanceName>`
 
-    Ex: `forj boot redstone on hpcloud as MyForge`
+    Ex: `forj boot redstone MyForge`. In this example, forj will create a `redstone` blueprint forge named `MyForge`, using the default `MyForjAccount`
 
 forj command line details:
 --------------------------
@@ -87,44 +91,81 @@ forj command line details:
     end
   end
 
-  # BOOT
+################################# BOOT
   desc 'boot <Blueprint> on <Provider> as <InstanceName> [options]', 'boot a Maestro box and instruct it to provision the blueprint'
 
   long_desc <<-LONGDESC
 This task boot a new forge with the following options
 \x5- blueprint : Is the name of the blueprint (currently cli only supports redstone)
-\x5- Provider : in which cloud provider to deploy the forge
 \x5- InstanceName : name of the forge
 
     Ex: forj boot redstone on hpcloud as maestro_test
 
-`forj boot` load predefine valued from `lib/defaults.yaml`. If you need to change one of them, add this value in your ~/.forj/config.yaml.
+`forj boot` load predefined forj values from `lib/defaults.yaml`. If you need to change one of them, add the key/value in your local config (-c or `~/.forj/config.yaml`).
 The list of predefined values can be retrieved with forj show defaults
 
   LONGDESC
 
-  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj account name to use. By default, it takes the provider name.'
-  method_option :infra,            :aliases => '-i',   :desc => 'Defines your Infra directory to use while booting. You can also set FORJ_INFRA_DIR.'
-  method_option :maestro_repo,     :aliases => '-m',   :desc => 'To use a different Maestro repository already cloned. By default, Maestro is cloned to ~/.forj/maestro from github.'
-  method_option :key_name,         :aliases => '-k',   :desc => "Keypair name to use."
-  method_option :key_path,         :aliases => '-p',   :desc => "Private or Public key file. forj will determine if you provide a public key or a private, if respectively the extension '.pub' exist or not."
-
+  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
+  method_option :maestro_repo,     :aliases => '-m',   :desc => "To use a different Maestro repository already cloned. 
+                                           By default, Maestro is systematically cloned to ~/.forj/maestro from github.
+                                           
+Following options superseed your config file or forj defaults."
+  method_option :infra,            :aliases => '-r',   :desc => 'config: infra_repo    : Defines your Infra directory to use while booting. You can also set FORJ_INFRA_DIR.'
+  method_option :key_name,         :aliases => '-k',   :desc => "config: keypair_name  : Keypair name to use."
+  method_option :key_path,         :aliases => '-p',   :desc => "config: keypair_path  : Private or Public key file to use."
+  method_option :security_group,   :aliases => '-s',   :desc => "config: security_group: Security group name to use and configure."
+  method_option :image,            :aliases => '-i',   :desc => "config: image         : Image name to use to build Maestro and blueprint nodes."
+  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.
+
+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 => '-B',   :desc => 'The build will extract from git branch name. It sets the configuration build <config> to the branch name <branch>.'
-  method_option :test_box,         :aliases => '-T',   :desc => 'Create test.rb-box meta from the repository path provided.'
+  method_option :branch,           :aliases => '-R',   :desc => "Branch name to clone for maestro. 
 
-  def boot(blueprint, on, cloud_provider, as, name)
+Maestro/infra bootstrap debugging:"
+  method_option :test_box,         :aliases => '-T',   :desc => "Identify a path to become your test-box repository. 
+                                           Ex: if your maestro is in ~/src/forj-oss, --test_box ~/src/forj-oss/maestro build.sh and 
+                                               test-box will send your local maestro repo to your box, for boot."
+
+  def boot(blueprint, on_or_name, old_accountname = nil, as = nil, old_name = nil)
+  
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
-      oConfig=ForjConfig.new(options[:config])
+
+      oConfig = ForjConfig.new(options[:config])
+
+
+      # depreciated: <BluePrint> on <AccountName> as <InstanceName>
+      if old_accountname and as and old_name
+         msg = "The syntax `forj boot '%s' on '%s' as '%s'` is depreciated.\nUse `forj boot '%s' '%s'" % [blueprint, old_accountname, old_name, blueprint, old_name]
+         if oConfig.get('account_name') == old_accountname
+            Logging.warning("%s` instead." % msg)
+         else   
+            Logging.warning("%s -a '%s'` instead." % [msg, old_accountname])
+         end
+         name = old_name
+         oConfig.set('account_name', old_accountname)
+      else
+         name = on_or_name
+      end
 
       Logging.fatal(1, "instance name '%s' not supported. Support only lower case, numeric and dash caracters." % [name]) if not /^[\d[[:lower:]]-]+$/ =~ name
 
       # Options are added if they are set. Otherwise, get will retrieve the default value.
-      oConfig.set('account_name', options[:account_name])
-      oConfig.set('infra_repo',   options[:infra])
-      oConfig.set('keypair_name', options[:key_name])
+      oConfig.set('account_name',   options[:account_name]) if options[:account_name]
+      oConfig.set('infra_repo',     options[:infra])
+      oConfig.set('keypair_name',   options[:key_name])
+      oConfig.set('keypair_path',   options[:key_path])
+      oConfig.set('security_group', options[:security_group])
+      oConfig.set('image',          options[:image])
+      oConfig.set('flavor',         options[:maestro_flavor])
+      oConfig.set('bp_flavor',      options[:bp_flavor])
+      oConfig.set(:maestro_repo ,   options[:maestro_repo])
+      oConfig.set(:test_box, File.expand_path(options[:test_box])) if options[:test_box] and File.directory?(File.expand_path(options[:test_box]))
+      
+      
       if options[:key_path]
          mFound = options[:key_path].match(/^(.*)(\.pub)?$/)
          if mFound
@@ -138,27 +179,34 @@ The list of predefined values can be retrieved with forj show defaults
          end
       end
 
-      # TODO: Be able to support the default provider from config.yaml
-      oConfig.set('provider', cloud_provider)
-      Boot.boot(blueprint, name,
-                options[:build],
+      Boot.boot(blueprint, name, options[:build],
                 options[:build_config], options[:branch],
-                options[:maestro_repo], options[:boothook],
-                options[:box_name], oConfig)
+                options[:boothook], options[:box_name], oConfig)
   end
 
-  desc 'show defaults', 'Show list of predefined value you can update in your ~/.forj/config.yaml'
-
-  def show(name)
-     oConfig=ForjConfig.new()
+################################# Show defaults
+   desc 'show defaults', 'Show list of predefined value you can update in your ~/.forj/config.yaml'
+   method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
+
+   def show(name)
+      case name
+         when 'defaults'
+            oConfig=ForjConfig.new()
+            oConfig.set('account_name',   options[:account_name])
+            oForjAccount = ForjAccount.new(oConfig)
+            oForjAccount.ac_load()
+
+            puts 'List of default values: (local refer to your config file. hash refer to your FORJ account data)'
+            puts '-----------------------'
+            puts oConfig.default_dump([oForjAccount.hAccountData]).to_yaml
+            puts '-----------------------'
+            puts "To change default values, update your ~/.forj/config.yaml and add the key/value entry under 'default' section."
+         else
+            Logging.error("object '%s' unknown." % name)
+      end
+   end
 
-     puts 'List of default values:
---------------------------'
-     puts rhGet(oConfig.yConfig,'default').to_yaml()
-     puts '--------------------------'
-     puts "You can change any of those variables by editing/adding them in your ~/.forj/config.yaml, under section 'default:'"
-  end
-  # DOWN
+################################# DOWN
   desc 'down', 'delete the Maestro box and all systems installed by the blueprint'
   long_desc <<-LONGDESC
   Not yet implemented
@@ -166,11 +214,11 @@ The list of predefined values can be retrieved with forj show defaults
 
   def down(name)
       Logging.set_level(Logger::INFO) if options[:verbose]
-    Logging.set_level(Logger::DEBUG) if options[:debug]
-    Down.down(name)
+      Logging.set_level(Logger::DEBUG) if options[:debug]
+      Down.down(name)
   end
 
-  # SSH
+################################# SSH
   desc 'ssh', 'connect to your forge thru ssh'
   long_desc <<-LONGDESC
 Connect through ssh to an existing instance
@@ -184,26 +232,37 @@ Connect through ssh to an existing instance
     Ssh.connect(name, server)
   end
 
-  # SETUP
-  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj account name to use. By default, it takes the provider name.'
+################################# SETUP
+  method_option :keypair_name,         :aliases => '-k',   :desc => "config keypair_name : Keypair name attached as default to your FORJ account."
+  method_option :keypair_path,         :aliases => '-p',   :desc => "config keypair_path : SSH key file (private or public) to attach as default to your FORJ account. 
+                                       It will attach any detected private/public key thanks to the file name 
+                                       (without extension/.pem = private, .pub = public)"
 
-  desc 'setup [Provider] [options]', 'set the hpcloud credentials for forj cli'
+  desc 'setup [AccountName [Provider]] [options]', "Setup FORJ cloud account credentials and information."
   long_desc <<-LONGDESC
-Set the cloud credentials and services for forj. Currently supports only hpcloud provider.
+This setup will configure a FORJ account used to connect to your cloud system.
+\x5It will ask for your cloud provider credentials and services. 
+
+If AccountName is not set, 'hpcloud' will be used for AccountName and provider name, by default.
+\x5If AccountName is not set without provider, 'hpcloud' provider will be used, by default.
+
+WARNING! Currently supports only hpcloud provider.
 
 Several data will be requested like:
-\x5- access_key: access key from hpcloud
-\x5- secret_key: secret key from hpcloud
-\x5- auth_uri: identity endpoint
-\x5- tenant_id: id for the tenant you want to use
-\x5- availability_zone: which availability zone will be deployed
+\x5- Cloud provider credentials and services.
+\x5- user/password (password is encrypted)
+\x5- DNS settings if you want Maestro to manage it.
+\x5- domain name to add to each boxes hostname 
   LONGDESC
-  def setup(sProvider = 'hpcloud')
+  def setup(sAccountName = 'hpcloud', sProvider = "hpcloud")
     Logging.set_level(Logger::INFO)  if options[:verbose]
     Logging.set_level(Logger::DEBUG) if options[:debug]
     oConfig=ForjConfig.new(options[:config])
     oConfig.set('provider', sProvider)
-    Setup.setup(oConfig, options)
+    oConfig.set('account_name', sAccountName)
+    oConfig.set('keypair_path', options[:keypair_path]) if options[:keypair_path]
+    oConfig.set('keypair_name', options[:keypair_name]) if options[:keypair_name]
+    Setup.setup(oConfig)
   end
 
 end

data/lib/boot.rb

@@ -35,21 +35,28 @@ include Helpers
 #
 module Boot
   def boot(blueprint, name, build, build_config,
-      branch, maestro_repo, boothook, box_name,
-      oConfig)
+      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')
+
+      oForjAccount = ForjAccount.new(oConfig)
+
+      oForjAccount.ac_load()
+
+
+      # Load Forj account data
+      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=oConfig.get('provider')
-      Logging.fatal(1, 'No provider specified.') if not cloud_provider
+      cloud_provider = oForjAccount.get(:account, :provider, 'hpcloud')
 
       if cloud_provider != 'hpcloud'
          Logging.fatal(1, "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider)
       end
 
-      oConfig.set('account_name', cloud_provider)
-
-      initial_msg = 'booting %s on %s (~/.forj/forj.log)' % [blueprint , cloud_provider]
+      initial_msg = "booting %s on %s\nCheck log with `tail -f ~/.forj/forj.log`.\nUse --verbose or --debug for more boot status on screen" % [blueprint , cloud_provider]
       Logging.high_level_msg(initial_msg) #################
 
       # Initialize defaults
@@ -57,9 +64,6 @@ module Boot
 
       infra_dir = File.expand_path(oConfig.get('infra_repo'))
       
-      # Load Forj account data
-      forjAccountFile = File.join($FORJ_ACCOUNTS_PATH, oConfig.get('account_name'))
-      oConfig.ExtraLoad(forjAccountFile, :forj_accounts, oConfig.get('account_name'))
 
       # Check about infra repo compatibility with forj cli
       bBuildInfra = Repositories.infra_rebuild_required?(oConfig, infra_dir)
@@ -77,18 +81,19 @@ module Boot
       end
 
       # Get FORJ DNS setting
-      yDNS = oConfig.ExtraGet(:forj_accounts, oConfig.get('account_name'), :dns)
-      Logging.fatal(1, "DNS or domain name are missing. Please execute forj setup %s" % oConfig.get('account_name')) if not yDNS
+      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
+
+      branch = oConfig.get('branch') unless branch
 
       # Step Maestro Clone
-      if not maestro_repo
-         Logging.high_level_msg('cloning maestro repo ...' ) #################
+      if not oConfig.get(:maestro_repo)
          Logging.info('cloning maestro repo from \'%s\'...' % maestro_url)
          Repositories.clone_repo(maestro_url)
          maestro_repo=File.expand_path('~/.forj/maestro')
       else
-         maestro_repo=File.expand_path(maestro_repo)
-         if not File.exists?('%s/templates/infra/%s-maestro.box.GITBRANCH.env.tmpl' % [maestro_repo, cloud_provider])
+         maestro_repo=File.expand_path(oConfig.get(:maestro_repo))
+         if not File.exists?('%s/templates/infra/maestro.box.%s.env' % [maestro_repo, branch])
             Logging.fatal(1, "'%s' is not a recognized Maestro repository. forj cli searched for templates/infra/%s-maestro.box.GITBRANCH.env.tmpl" % [maestro_repo, cloud_provider])
          end
          Logging.info('Using your maestro cloned repo \'%s\'...' % maestro_repo)
@@ -102,27 +107,23 @@ module Boot
       # Connect to services
       oFC=ForjConnection.new(oConfig)
 
-      Logging.high_level_msg('Configuring network...') #################
       Logging.info('Configuring network \'%s\'' % [oConfig.get('network')])
       begin
         network = Network.get_or_create_network(oFC, oConfig.get('network'))
         subnet = Network.get_or_create_subnet(oFC, network.id, network.name)
         router = Network.get_or_create_router(oFC, network, subnet)
       rescue => e
-        Logging.fatal(1, "Network properly configured is required.\n%s\n%s" % [e.message, e.backtrace.join("\n")])
+        Logging.fatal(1, "Network properly configured is required.", e)
       end
 
-      Logging.state('Configuring keypair...') #################
-      Logging.info('Configuring keypair \'%s\'' % [oConfig.get('keypair_name')])
-      SecurityGroup.hpc_import_key(oConfig, oFC.sAccountName)
+      Logging.info('Configuring keypair \'%s\'' % [oForjAccount.get(:credentials, 'keypair_name')])
+      SecurityGroup.hpc_import_key(oForjAccount)
 
-      Logging.state('Configuring security group...') #################
 
       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.state('Configuring security group ports...') #################
       ports.each do |port|
         port = port.to_s if port.class != String
         if not /^\d+(-\d+)?$/ =~ port
@@ -139,13 +140,14 @@ module Boot
       ENV['FORJ_CLI_ENV'] = oBuildEnv.sBuildEnvFile
       oBuildEnv.set('FORJ_HPC',             oFC.sAccountName)
       oBuildEnv.set('FORJ_HPC_NET',         network.name)
-      oBuildEnv.set('FORJ_SECURITY_GROUP',  oConfig.get('security_group'))
-      oBuildEnv.set('FORJ_KEYPAIR',         oConfig.get('keypair_name'))
-      oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oConfig.get('keypair_path') + '.pub')
-      oBuildEnv.set('FORJ_BASE_IMG',        oConfig.get('image'))
-      oBuildEnv.set('FORJ_FLAVOR',          oConfig.get('flavor'))
-      oBuildEnv.set('FORJ_TENANT_NAME',     rhGet(oConfig.ExtraGet(:forj_accounts, oFC.sAccountName, :compute), :tenant_name))
-      oBuildEnv.set('FORJ_HPC_COMPUTE',     rhGet(oConfig.ExtraGet(:hpc_accounts, oFC.sAccountName, :regions), :compute))
+      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_HPC_COMPUTE',     rhGet(oConfig.ExtraGet(:hpc_accounts,  oFC.sAccountName, :regions), :compute))
       
 
       oBuildEnv.set('FORJ_DOMAIN', yDNS[:domain_name])
@@ -162,12 +164,12 @@ module Boot
       build = 'bin/build.sh' unless build
 
       build_config = oConfig.get('build_config')
-      branch = oConfig.get('branch') unless branch
       box_name = oConfig.get('box_name')
 
-      meta = '--meta blueprint=%s ' % [blueprint]
+      arg = '--meta blueprint=%s ' % [blueprint]
+      arg += "--test-box '%s' " % oConfig.get(:test_box) if oConfig.exist?(:test_box)
 
-      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, infra_dir, build_config, branch, meta]
+      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, infra_dir, build_config, branch, arg]
 
       maestro_build_path = File.join(maestro_repo, 'build')
 
@@ -227,9 +229,8 @@ class BuildEnv
       begin
          File.open(@sBuildEnvFile, 'w') do |out|
             @yBuildEnvVar.each do | key, value |
-               if rhExist?(@oConfig.yConfig, 'description', key)
-                  out.write("# %s - %s\n" % [key, rhGet(@oConfig.yConfig, 'description', key)])
-               end
+               desc = @oConfig.getAppDefault(:description, key)
+               out.write("# %s - %s\n" % [key, desc]) if desc
                value = "" if not value
                out.write("%s='%s'\n\n" % [key, value])
             end