forj 0.0.29 → 0.0.30

data/README.md

@@ -2,8 +2,53 @@ Forj cli
 =====================
 
 
-How to use it
+Installation
 =====================
+For ruby 1.9
+
+    sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -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 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 gem install forj
+
+
+How to use forj cli
+=====================
+Setup forj
+
+    forj setup # follow the instructions
+
+Boot a forge
+
+    forj boot <blueprint> on <cloud_provider> as <name>
+    e.g. forj boot redstone on hpcloud as maestro_01
+
+Optional arguments
+
+    -u --build #Replace the default build.sh.
+    -d --build_config_dir # Defines the build configuration directory to load the build configuration file.
+    -c --build_config # The build config file to load <confdir>/<BoxName>.<Config>.env.
+    -b --branch # The build will extract from git branch name.
+    -t --test_box # Create test-box meta from the repository path provided.
+    -r --git_repo # The box built will use a different git repository sent out to <user_data>.
+    -h --boothook # By default, boothook file used is build/bin/build-tools/boothook.sh.
+    -x --box_name # Defines the name of the box or box image to build.
+    -k --key_name # Key pair name to import.
+    -p --key_path # Public key pair data.
+
+To ssh into a server
+
+    forj ssh <name> <node>
+    e.g. forj ssh maestro_01 [maestro, ci, util, review] # the nodes from your blueprint
 
 
 Contributing to Forj
@@ -14,4 +59,4 @@ your development today!
 
 License
 =====================
-forj cli is licensed under the Apache License, Version 2.0.  See LICENSE for full license text.
+Forj Cli is licensed under the Apache License, Version 2.0.  See LICENSE for full license text.

data/bin/forj

@@ -74,21 +74,24 @@ class Forj < Thor
 
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
 
-  method_option :build,            :aliases => '-b',   :desc => 'Replace the default build.sh'
-  method_option :build_config_dir, :aliases => '-bcd', :desc => 'Defines the build configuration directory to load the build configuration file. You can set FORJ_BLD_CONF_DIR. By default, it will look in your current directory.'
-  method_option :build_config,     :aliases => '-bc',  :desc => 'The build config file to load <confdir>/<BoxName>.<Config>.env. By default, uses "master" as Config.'
-  method_option :branch,           :aliases => '-gb',  :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 => '-tb',  :desc => 'Create test-box meta from the repository path provided.'
-  method_option :git_repo,         :aliases => '-gr',  :desc => 'The box built will use a different git repository sent out to <user_data>. This repository needs to be read only. No keys are sent.'
-  method_option :boothook,         :aliases => '-bh',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
-  method_option :box_name,         :aliases => '-bn',  :desc => 'Defines the name of the box or box image to build.'
+  method_option :build,            :aliases => '-u',   :desc => 'Replace the default build.sh'
+  method_option :build_config_dir, :aliases => '-d',   :desc => 'Defines the build configuration directory to load the build configuration file. You can set FORJ_BLD_CONF_DIR. By default, it will look in your current directory.'
+  method_option :build_config,     :aliases => '-c',   :desc => 'The build config file to load <confdir>/<BoxName>.<Config>.env. By default, uses "master" as Config.'
+  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-box meta from the repository path provided.'
+  method_option :git_repo,         :aliases => '-r',   :desc => 'The box built will use a different git repository sent out to <user_data>. This repository needs to be read only. No keys are sent.'
+  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 :box_name,         :aliases => '-x',   :desc => 'Defines the name of the box or box image to build.'
+  method_option :key_name,         :aliases => '-k',   :desc => 'Import a key pair.'
+  method_option :key_path,         :aliases => '-p',   :desc => 'Public key data'
 
   def boot(blueprint, on, cloud_provider, as, name, test = false)
       Boot.boot(blueprint, cloud_provider, name,
                 options[:build], options[:build_config_dir],
                 options[:build_config], options[:branch],
                 options[:git_repo], options[:boothook],
-                options[:box_name], test)
+                options[:box_name], options[:key_name],
+                options[:key_path], test)
   end
 
   desc 'down', 'delete the Maestro box and all systems installed by the blueprint'

data/lib/boot.rb

@@ -36,9 +36,10 @@ include Helpers
 #
 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]
 
@@ -60,6 +61,10 @@ module Boot
 
       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|
@@ -68,8 +73,8 @@ module Boot
 
       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
@@ -98,9 +103,9 @@ module Boot
 
       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

data/lib/security.rb

@@ -89,4 +89,9 @@ module SecurityGroup
       Logging.error(e.message)
     end
   end
+
+  def upload_existing_key(key_name, key_path)
+    command = 'hpcloud keypairs:import %s %s' % [key_name, key_path]
+    Kernel.system(command)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12934080 !ruby/object:Gem::Requirement
+  requirement: &14971980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *12934080
+  version_requirements: *14971980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12933440 !ruby/object:Gem::Requirement
+  requirement: &14971040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *12933440
+  version_requirements: *14971040
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &12932840 !ruby/object:Gem::Requirement
+  requirement: &14969800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *12932840
+  version_requirements: *14969800
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &12932140 !ruby/object:Gem::Requirement
+  requirement: &14966500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *12932140
+  version_requirements: *14966500
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &12931320 !ruby/object:Gem::Requirement
+  requirement: &14965860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *12931320
+  version_requirements: *14965860
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &12930460 !ruby/object:Gem::Requirement
+  requirement: &14965120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *12930460
+  version_requirements: *14965120
 description: forj command line
 email:
 - forj@forj.io