lib/boot.rb in forj-0.0.29 vs lib/boot.rb in forj-0.0.30

@@ -34,13 +34,14 @@
 #
 # Boot module
 #
 module Boot
   def boot(blueprint, cloud_provider, name,
-           build, build_config_dir, build_config,
-           branch, git_repo, boothook, box_name,
-           test = false)
+      build, build_config_dir, build_config,
+      branch, git_repo, boothook, box_name,
+      key_name, key_path,
+      test = false)
     begin
       initial_msg = 'booting %s on %s' % [blueprint , cloud_provider]
 
       Logging.info(initial_msg)
       puts (initial_msg)
@@ -58,20 +59,24 @@
       router = Network.get_router(definitions[blueprint]['router'])
       Network.create_router_interface(subnet.id, router)
 
       security_group = SecurityGroup.create_security_group(blueprint)
 
+      key_name = 'nova' unless key_name
+      key_path = '~/.ssh/nova' unless key_path
+      SecurityGroup.upload_existing_key(key_name, key_path)
+
       ports = definitions['redstone']['ports']
 
       ports.each do|port|
         Network.create_security_group_rule(security_group.id, 'tcp', port, port)
       end
 
       ENV['FORJ_HPC_NETID'] = network.id
       ENV['FORJ_SECURITY_GROUP'] = security_group.name
-      #ENV['FORJ_KEYPAIR'] = definitions[blueprint]['keypair']
-      #ENV['FORJ_HPC_NOVA_KEYPUB'] = definitions[blueprint]['keypair']
+      ENV['FORJ_KEYPAIR'] = key_name
+      ENV['FORJ_HPC_NOVA_KEYPUB'] = key_name
 
       # run build.sh to boot maestro
       current_dir = Dir.pwd
       home = Helpers.get_home_path
       build_path = home + '/.forj/maestro/build'
@@ -96,12 +101,12 @@
       Kernel.system(command)
       Dir.chdir(current_dir)
 
       if test
         puts 'test flag is on, deleting objects'
-          Network.delete_router_interface(subnet.id, router)
-          Network.delete_subnet(subnet.id)
-          Network.delete_network(network.name)
+        Network.delete_router_interface(subnet.id, router)
+        Network.delete_subnet(subnet.id)
+        Network.delete_network(network.name)
       end
 
     rescue SystemExit, Interrupt
       msg = '%s interrupted by user' % [name]
       puts msg