lib/boot.rb in forj-0.0.35 vs lib/boot.rb in forj-0.0.36

@@ -40,20 +40,20 @@
       oConfig, test = false)
     begin
 
       # Check options and set data
       cloud_provider=oConfig.get('provider')
-      raise 'No provider specified.' if not cloud_provider
+      Logging.fatal(1, 'No provider specified.') if not cloud_provider
 
       if cloud_provider != 'hpcloud'
-         raise "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider
+         Logging.fatal(1, "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider)
       end
 
       oConfig.setDefault('account_name', cloud_provider)
 
       initial_msg = 'booting %s on %s (~/.forj/forj.log)' % [blueprint , cloud_provider]
-      Logging.message(initial_msg)
+      Logging.high_level_msg(initial_msg) #################
 
       # Initialize defaults
       maestro_url =  oConfig.get('maestro_url')
 
       infra_dir = oConfig.get('infra_repo') unless infra_dir
@@ -71,10 +71,11 @@
          return
       end
 
       # Step Maestro Clone
       if not maestro_repo
+         Logging.high_level_msg('cloning 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)
@@ -90,29 +91,31 @@
       end
 
       # 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")])
       end
 
-
+      Logging.state('Configuring keypair...') #################
       Logging.info('Configuring keypair \'%s\'' % [oConfig.get('keypair_name')])
-      key_name = oConfig.get('keypair_name')
-      key_path = oConfig.get('keypair_path')
-      SecurityGroup.upload_existing_key(key_name, key_path)
+      SecurityGroup.hpc_import_pubkey(oConfig, oFC.sAccountName)
 
+      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 
            Logging.error("Port '%s' is not valid. Must be <Port> or <PortMin>-<PortMax>" % [port])
         else 
@@ -121,13 +124,14 @@
            portmax = (mPortFound[3]) ? (mPortFound[3]) : (portmin)
            Network.get_or_create_rule(oFC, security_group.id, 'tcp', portmin, portmax)
         end   
       end
 
+      ENV['FORJ_HPC'] = oFC.sAccountName
       ENV['FORJ_HPC_NET'] = network.name
       ENV['FORJ_SECURITY_GROUP'] = oConfig.get('security_group')
-      ENV['FORJ_KEYPAIR'] = key_name
-      ENV['FORJ_HPC_NOVA_KEYPUB'] = key_path
+      ENV['FORJ_KEYPAIR'] = oConfig.get('keypair_name')
+      ENV['FORJ_HPC_NOVA_KEYPUB'] = oConfig.get('keypair_path')
       ENV['FORJ_BASE_IMG'] = oConfig.get('image')
 
       # run build.sh to boot maestro
       puts