forj 0.0.30 → 0.0.31

data/README.md

@@ -4,6 +4,15 @@ Forj cli
 
 Installation
 =====================
+For ruby 2.0
+  Fedora/CentOS/Redhat/rpm like system : 
+    sudo yum install ruby-dev build-essential libopenssl-ruby libssl-dev zlib1g-dev -y
+    sudo gem install forj
+
+  Ubuntu/Debian/debian like system (not tested)
+    sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
+    sudo gem install forj
+
 For ruby 1.9
 
     sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
@@ -59,4 +68,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

@@ -78,12 +78,13 @@ class Forj < Thor
   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 :test_box,         :aliases => '-t',   :desc => 'Create test.rb-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'
+  method_option :catalog,          :aliases => '-y',   :desc => 'A path for the yaml file data about the blueprint'
 
   def boot(blueprint, on, cloud_provider, as, name, test = false)
       Boot.boot(blueprint, cloud_provider, name,
@@ -91,7 +92,8 @@ class Forj < Thor
                 options[:build_config], options[:branch],
                 options[:git_repo], options[:boothook],
                 options[:box_name], options[:key_name],
-                options[:key_path], test)
+                options[:key_path],options[:region],
+                options[:catalog], test)
   end
 
   desc 'down', 'delete the Maestro box and all systems installed by the blueprint'

data/lib/boot.rb

@@ -38,7 +38,7 @@ module Boot
   def boot(blueprint, cloud_provider, name,
       build, build_config_dir, build_config,
       branch, git_repo, boothook, box_name,
-      key_name, key_path,
+      key_name, key_path, region, catalog,
       test = false)
     begin
       initial_msg = 'booting %s on %s' % [blueprint , cloud_provider]
@@ -48,33 +48,58 @@ module Boot
 
       forj_dir = File.expand_path(File.dirname(__FILE__))
       Dir.chdir(forj_dir)
-      definitions = YamlParse.get_values('catalog.yaml')
+
+      if catalog
+        definitions = YamlParse.get_values(catalog)
+      else
+        definitions = YamlParse.get_values('catalog.yaml')
+      end
 
       maestro_url =  definitions['default']['maestro']
 
       Repositories.clone_repo(maestro_url)
+      infra_exists = nil
+
+      begin
+        if File.directory?(definitions[blueprint]['infra'])
+          infra_exists = true
+        else
+          Repositories.create_infra
+        end
+      rescue => e
+        infra_exists = false
+        puts e.message
+      end
+
 
-      network = Network.create_network(name)
-      subnet = Network.create_subnet(network.id, name)
-      router = Network.get_router(definitions[blueprint]['router'])
-      Network.create_router_interface(subnet.id, router)
+      network = Network.get_or_create_network(definitions[blueprint]['network'])
+      begin
+        subnet = Network.get_or_create_subnet(network.id, name)
+        router = Network.get_router(definitions[blueprint]['router'])
+        Network.create_router_interface(subnet.id, router)
+      rescue => e
+        puts e.message
+      end
 
-      security_group = SecurityGroup.create_security_group(blueprint)
+      security_group = SecurityGroup.get_or_create_security_group(definitions[blueprint]['security_group'])
 
-      key_name = 'nova' unless key_name
-      key_path = '~/.ssh/nova' unless key_path
+      key_name = definitions[blueprint]['keypair_name'] unless key_name
+      key_path = definitions[blueprint]['keypair_path'] unless key_path
       SecurityGroup.upload_existing_key(key_name, key_path)
 
-      ports = definitions['redstone']['ports']
+      ports = definitions[blueprint]['ports']
 
       ports.each do|port|
-        Network.create_security_group_rule(security_group.id, 'tcp', port, port)
+        Network.get_or_create_rule(security_group.id, 'tcp', port, port)
       end
 
       ENV['FORJ_HPC_NETID'] = network.id
       ENV['FORJ_SECURITY_GROUP'] = security_group.name
       ENV['FORJ_KEYPAIR'] = key_name
-      ENV['FORJ_HPC_NOVA_KEYPUB'] = key_name
+      ENV['FORJ_HPC_KEYPUB'] = key_path
+      if region
+        ENV['FORJ_REGION'] = region
+      end
 
       # run build.sh to boot maestro
       current_dir = Dir.pwd
@@ -84,20 +109,23 @@ module Boot
 
       build = 'bin/build.sh' unless build
 
-      build_config_dir = '~/.forj/maestro/build/conf' unless build_config_dir
-
-      build_config = 'box' unless build_config
+      if infra_exists
+        build_config_dir = definitions[blueprint]['infra'] unless build_config_dir
+      else
+        build_config_dir = definitions[blueprint]['build_config_dir'] unless build_config_dir
+      end
 
-      branch = 'master' unless branch
+      build_config = definitions[blueprint]['build_config'] unless build_config
 
-      git_repo = 'review:forj-oss/maestro' unless git_repo
+      branch = definitions[blueprint]['branch'] unless branch
 
-      box_name = 'maestro' unless box_name
+      box_name = definitions[blueprint]['box_name'] unless box_name
 
-      boothook = '~/.forj/maestro/build/bin/build-tools/boothook.sh' unless boothook
+      meta = '--meta blueprint=%s --meta HPCLOUD_PRIV=~/.cache/forj/master.forj-13.5.g64' % [blueprint]
 
-      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --gitRepo %s --boothook %s' % [build, name, box_name, build_config_dir, build_config, branch, git_repo, boothook]
+      command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, build_config_dir, build_config, branch, meta]
 
+      Logging.info('using build.sh for %s' % [name])
       Kernel.system(command)
       Dir.chdir(current_dir)
 

data/lib/build_tmpl/build-env.py

@@ -0,0 +1,293 @@
+#!/bin/env python
+#
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# This script is used to create a env file used by build.sh.
+# It is based on Maestro/templates/infra/maestro.box.GITBRANCH.env.tmpl
+
+# This script detects few tags, and ask to enter the appropriate vallue, 
+# then save the result to a directory given by the user.
+
+# As this script is very early in the boot process, we are running on end user worstation.
+# We will avoid adding non default module like:
+# - ptemplates, django for template interpreter. We use our own simple code to make it work with basics rules.
+#   It provides variable detection, with comments and default variables.
+
+import sys 
+import getopt
+#import urllib2
+#from urlparse import urlparse,ParseResult
+import re
+import logging
+import logging.handlers
+import yaml
+import os
+#import subprocess
+#import distutils.spawn
+#import string 
+#from datetime import date,datetime
+#import time
+#import tempfile
+import readline
+
+# Defining defaults
+
+GITBRANCH='master'
+MAESTRO_RPATH_TMPL="templates/infra/"
+MAESTRO_TMPL_FILE="maestro.box.GITBRANCH.env.tmpl"
+MAESTRO_TMPL_PROVIDER='hpcloud'
+
+# 
+# 
+   
+##############################
+def help(sMsg):
+   print 'build-env.py [-h|--help] --maestro-repo MaestroPath --env-path BuildEnvPath [--gitbranch BranchName] [-d|--debug] [-v|--verbose]'
+
+# TODO Support for re-build it.
+
+##############################
+# TODO: split this function in 3, for code readibility
+
+def BuildEnv(EnvPath, MaestroFile, MaestroPath, GitBranch):
+  """Build env file if doesn't exist."""
+
+  global MAESTRO_TMPL_FILE
+  oLogging=logging.getLogger('build-env')
+
+  # -----------------------------------------------
+  # Check step ------------------------------------
+
+  if not os.path.exists(EnvPath):
+     oLogging.error("'%s' do not exist. This directory is required. (--env-path)", EnvPath)
+     sys.exit(1)
+
+  if not os.path.isdir(EnvPath):
+     oLogging.error("'%s' is not a valid directory (--env_path)", EnvPath)
+     sys.exit(1)
+
+  if not os.path.isdir(MaestroPath):
+     oLogging.error("'%s' is not a valid directory. Should refer to Maestro repository root dir.(--maestro-path)", MaestroPath)
+     sys.exit(1)
+     
+
+  sInputFile=os.path.join(MaestroPath, MaestroFile)
+  if not os.path.exists(sInputFile):
+     oLogging.error("Unable to find template '%s' from '%s'. Are you sure about Maestro Repository root path given? Check and retry.", MaestroPath, MaestroFile)
+     sys.exit(1)
+
+  # Replace GITBRANCH Name by real git branch value.
+  sOutputFile=os.path.join(EnvPath,re.sub('GITBRANCH',GITBRANCH,MAESTRO_TMPL_FILE))
+  sOutputFile=re.sub('.tmpl$','',sOutputFile)
+  
+  if os.path.exists(sOutputFile):
+     # TODO Support for re-build it.
+     oLogging.info("'%s' exists. If you want to rewrite it, remove the file before.", sOutputFile)
+     sys.exit(0)
+  
+  # Load template variables and build list of variable to query
+  oLogging.debug("Opening template '%s'",sInputFile)
+  try:
+    fTmpl=open(sInputFile)
+  except IOError as e:
+    oLogging.error("Unable to open '%s'. Errno: %s (%s)", sInputFile, e.errno, e.strerror)
+    sys.exit(2)
+  
+  # -----------------------------------------------
+  # Reading template ------------------------------
+
+  print("Reading template '{0}'".format(sInputFile))
+  oComments={}
+  oVars={}
+
+  # Search for Variable. If the variable name ends with '!', this value could not be null.
+  reVar=re.compile('[^$]{([A-Z_-]+)(!)?(:.*?)?}')
+  # 1: Variable Name
+  # 2: Required if = '!' 
+  # 3: Default
+
+
+  # Search for comment
+  reComment=re.compile('^ *# +([A-Z_-]+): (.*)$')
+
+  for line in fTmpl:
+
+      # Detecting comment
+      oComment=reComment.search(line)
+      if oComment <> None:
+         oLogging.debug('Found "%s" = "%s"', oComment.group(1), oComment.group(2))
+         if oVars.has_key(oComment.group(1)):
+            oComments[oComment.group(1)]=oVars[oVar.group(1)]['comments']+'\n# '+oComment.group(2)
+         elif oComments.has_key(oComment.group(1)):
+            oComments[oComment.group(1)]=oComments[oComment.group(1)]+'\n# '+ oComment.group(2)
+         else:
+            oComments[oComment.group(1)]='# '+oComment.group(2)
+
+      oVar=reVar.search(line)   
+      if oVar <> None:
+         oLogging.debug('Found var "%s" from "%s"',oVar.group(1),line)
+
+         sComment=''
+         if oComments.has_key(oVar.group(1)):
+            sComment=oComments[oVar.group(1)]
+         else:
+            oComments.remove(oVar.group(1))
+
+         sDefault=''
+         bRequired=False
+         if oVar.group(2) <> None  :
+            bRequired=True
+            oLogging.debug("'%s' is required",oVar.group(1))
+         if oVar.group(3) <> None:
+            sDefault=oVar.group(3)[1:]
+            oLogging.debug("'%s' default value is '%s'",oVar.group(1),sDefault)
+            
+
+         oVars[oVar.group(1)]={ 'comments': sComment,
+                                'required': bRequired,
+                                'default': sDefault } 
+
+  oLogging.debug('template loaded.')
+
+  # -----------------------------------------------
+  # Ask section -----------------------------------
+
+  print "We need some information from you. Please ask the following question:\n"
+  # Time to ask information to the user.
+
+  for sElem in oVars:
+     print '{0}'.format(oVars[sElem]['comments'])
+     sPar="# "
+     if oVars[sElem]['default'] <> '':
+        sPar+='Default is "'+oVars[sElem]['default']+'".'
+     if oVars[sElem]['required'] :
+        if sPar <> "# " :
+           sPar+=' Required.'
+        else:
+           sPar='# Required.'
+
+     if sPar <> "":
+        print sPar
+     sValue=""
+
+     while sValue == "":
+       sValue=raw_input(sElem+'=')
+
+       if sValue == "":
+          sValue=oVars[sElem]['default']
+       
+       if oVars[sElem]['required']:
+          if sValue == "":
+             print "Value required. Please enter a value."
+       else:
+          break
+
+     oVars[sElem]['value']=sValue
+     print '{0}="{1}"\n'.format(sElem,sValue)
+
+
+  fTmpl.seek(0) # Read the file again to replace data
+  try:
+     fOutputFile=open(sOutputFile,"w+")
+  except IOError as e:
+    oLogging.error("Unable to open '%s' for write. Errno: %s (%s)", sOutputFile, e.errno, e.strerror)
+    sys.exit(2)
+
+  print "--------------------------------\nThank you\nWriting '{0}'".format(sOutputFile)
+
+  # -----------------------------------------------
+  # Time to save the template. --------------------
+  
+  reReplaced=re.compile('([^$])({([A-Z_-]+)(!)?(:.*?)?})')
+  for line in fTmpl:
+     oVar=reReplaced.search(line)
+
+     if oVar <> None:
+    
+        if oVar.group(1) <> None:
+           sValue=oVar.group(1)+oVars[oVar.group(3)]['value']
+        else:
+           sValue=oVars[oVar.group(3)]['value']
+        sNewLine=reReplaced.sub(sValue,line)
+     else:
+        sNewLine=line
+
+     sys.stdout.flush()
+     fOutputFile.write(sNewLine)
+  
+  fOutputFile.close()
+  fTmpl.close()
+  print 'Done'
+
+
+
+##############################
+def main(argv):
+  """Main function"""
+
+  global GITBRANCH
+  global MAESTRO_TMPL_PROVIDER
+  global MAESTRO_RPATH_TMPL
+
+  oLogging=logging.getLogger('build-env')
+  oLogging.setLevel(20)
+
+  try:
+     opts,args = getopt.getopt(argv,"hp:vd:r:P:", ["help", "--for-provider=", "env-path=" , "maestro-path=" ,"debug" ,"verbose" ])
+  except getopt.GetoptError, e:
+     oLogging.error('Error: '+e.msg)
+     help()
+     sys.exit(2)
+
+  for opt, arg in opts:
+     if opt in ('-h', '--help'):
+        help()
+        sys.exit()
+     elif opt in ('-v','--verbose'):
+        if oLogging.level >20:
+           oLogging.setLevel(oLogging.level-10)
+     elif opt in ('--debug','-d'):
+        logging.getLogger().setLevel(logging.DEBUG)
+        logging.debug("Setting debug mode")
+        oLogging.setLevel(logging.DEBUG)
+     elif opt in ('-p', '--env-path'):
+        ENV_PATH=arg
+     elif opt in ('--gitbranch'):
+        GITBRANCH=arg
+     elif opt in ('-r','--maestro-path'):
+        MAESTRO_PATH=arg
+     elif opt in ('-P','--for-provider'):
+        TMPL_PROVIDER=arg
+
+  # Start Main tasks - Testing required variables.
+  if not 'ENV_PATH' in locals() or not 'MAESTRO_PATH' in locals():
+     oLogging.error("--env-path or --maestro-path values missing. Please check command flags.")
+     sys.exit(1)
+
+
+  global MAESTRO_TMPL_FILE # template file to use.
+  
+  sMaestroFile=os.path.join(MAESTRO_RPATH_TMPL, MAESTRO_TMPL_PROVIDER+'-'+MAESTRO_TMPL_FILE)
+  BuildEnv(ENV_PATH, sMaestroFile, MAESTRO_PATH, GITBRANCH)
+
+  sys.exit(0)
+
+#####################################
+logging.basicConfig(format='%(asctime)s: %(levelname)s - %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
+
+if __name__ == "__main__":
+   main(sys.argv[1:])
+
+

data/lib/catalog.yaml

@@ -16,9 +16,18 @@ redstone:
   image: proto2b
   flavor: standard.xsmall
   ports: [22, 80, 443, 3131, 3000, 3132, 3133, 3134, 3135, 4505, 4506, 5000, 5666, 8000, 8080, 8081, 8083, 8125, 8139, 8140, 8773, 8774, 8776, 9292, 29418, 35357]
-  keypair: nova
+  keypair_path: ~/.hpcloud/keypairs/nova
+  keypair_name: nova
   router: private-ext
-  nodes: [maestro, ci, util, review]
+  security_group: default
+  network: private
+  # at this point you have to clone the infra project manually
+  build_config_dir: ~/forj/infra/build/boxes/maestro
+  build_config: box-13.5
+  branch: master
+  box_name: maestro
+  infra: ~/.forj/infra
+
 
 modus:
   ports: []

data/lib/compute.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'rubygems'
+require 'require_relative'
+
+require_relative 'connection.rb'
+include Connection
+require_relative 'log.rb'
+include Logging
+
+#
+# compute module
+#
+module Compute
+  def delete_forge(name)
+    instances = Connection.compute.servers.all(:name => name)
+    instances.each do|instance|
+      # make sure we don't delete another forge because fog filters
+      # the name in a "like syntax" way
+      Connection.compute.servers.get(instance.id).destroy
+    end
+  end
+end

data/lib/down.rb

@@ -24,6 +24,12 @@ require_relative 'yaml_parse.rb'
 include YamlParse
 require_relative 'security.rb'
 include SecurityGroup
+require_relative 'log.rb'
+include Logging
+require_relative 'ssh.rb'
+include Ssh
+require_relative 'compute.rb'
+include Compute
 
 #
 # Down module
@@ -32,30 +38,25 @@ module Down
   def down(name)
     begin
 
-      puts 'deleting %s...' % [name]
+      initial_msg = 'deleting forge "%s"' % [name]
+      Logging.info(initial_msg)
+      puts (initial_msg)
 
-      definitions = YamlParse::get_values('catalog.yaml')
+      Compute.delete_forge(name)
 
-      # get the subnet
-      subnet = Network::get_subnet(name)
-
-      # delete the router interface
-      router = Network::get_router(definitions['redstone']['router'])
+      router = Network.get_router('private-ext')
+      subnet = Network.get_subnet(name)
       Network.delete_router_interface(subnet.id, router)
 
-      # delete subnet
       Network.delete_subnet(subnet.id)
-
-      # delete security group
-      # Network.delete_security_group(security_group.id)
-
-      # delete network
-      Network.delete_network(name)
+      network = Network.get_network(name)
+      Network.delete_network(network.name)
 
     rescue SystemExit, Interrupt
       puts 'process interrupted by user'
+      Logging.error('process interrupted by user')
     rescue Exception => e
-      puts e
+      Logging.error(e.message)
     end
   end
 end

data/lib/network.rb

@@ -27,6 +27,25 @@ include Logging
 # Network module
 #
 module Network
+  def get_or_create_network(name)
+    network = get_network(name)
+    if network == nil
+      network = create_network(name)
+    end
+    network
+  end
+
+  def get_network(name)
+    begin
+      info = 'getting network %s' % [name]
+      Logging.info(info)
+      Connection.network.networks.all(:name => name)[0]
+    rescue => e
+      puts e.message
+      Logging.error(e.message)
+    end
+  end
+
   def create_network(name)
     begin
       info = 'creating network %s' % [name]
@@ -39,13 +58,25 @@ module Network
 
   def delete_network(network_name)
     begin
-      network = Connection.network.networks.all(:name => network_name)[0]
+      network = get_network(network_name)
       Connection.network.networks.get(network.id).destroy
     rescue => e
       Logging.error(e.message)
     end
   end
 
+  def get_or_create_subnet(network_id, name)
+    begin
+      subnet = get_subnet(name)
+      if subnet == nil
+        subnet = create_subnet(network_id, name)
+      end
+      subnet
+    rescue => e
+      Logging.error(e.message)
+    end
+  end
+
   def create_subnet(network_id, name)
     begin
       Connection.network.subnets.create(

data/lib/repositories.rb

@@ -49,5 +49,23 @@ module Repositories
         Logging.error(e.message)
       end
       Dir.chdir(current_dir)
+  end
+  def create_infra
+    home = File.expand_path('~')
+    path = home + '/.forj/'
+    infra = path + 'infra/'
+
+    if File.directory?(infra)
+      FileUtils.rm_r(infra)
     end
+    Dir.mkdir(infra)
+
+    command = 'cp -rp ~/.forj/maestro/templates/infra/cloud-init ~/.forj/infra/'
+    Kernel.system(command)
+
+    Dir.chdir('build_tmpl')
+
+    fill_template = 'python build-env.py -p ~/.forj/infra --maestro-path ~/.forj/maestro'
+    Kernel.system(fill_template)
+  end
 end

data/lib/security.rb

@@ -28,6 +28,15 @@ include Logging
 #
 module SecurityGroup
 
+  def get_or_create_security_group(name)
+    Logging.info('getting or creating security group for %s' % [name])
+    security_group = get_security_group(name)
+    if security_group == nil
+      security_group = create_security_group(name)
+    end
+    security_group
+  end
+
   def create_security_group(name)
     sec_group = nil
     begin
@@ -48,6 +57,14 @@ module SecurityGroup
     sec_group
   end
 
+  def get_security_group(name)
+    begin
+      Connection.network.security_groups.all({:name => name})[0]
+    rescue => e
+      Logging.error(e.message)
+    end
+  end
+
   def delete_security_group(security_group)
     begin
       sec_group = get_security_group(security_group)
@@ -82,14 +99,23 @@ module SecurityGroup
     end
   end
 
-  def get_security_group(name)
+  def get_security_group_rule(port)
     begin
-      Connection.network.security_groups.all({:name => name})
+      Connection.network.security_group_rules.all({:port_range_min => port, :port_range_max => port})[0]
     rescue => e
       Logging.error(e.message)
     end
   end
 
+  def get_or_create_rule(security_group_id, protocol, port_min, port_max)
+    Logging.info('getting or creating rule %s' % [port_min])
+    rule = get_security_group_rule(port_min)
+    if rule == nil
+      rule = create_security_group_rule(security_group_id, protocol, port_min, port_max)
+    end
+    rule
+  end
+
   def upload_existing_key(key_name, key_path)
     command = 'hpcloud keypairs:import %s %s' % [key_name, key_path]
     Kernel.system(command)

data/lib/setup.rb

@@ -15,6 +15,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
+require 'require_relative'
+
+require_relative 'yaml_parse.rb'
+include YamlParse
+
 #
 # Setup module call the hpcloud functions
 #
@@ -22,6 +28,51 @@ module Setup
   def setup
     # delegate the initial configuration to hpcloud (unix_cli)
     Kernel.system('hpcloud account:setup')
-    Kernel.system('hpcloud keypairs:add nova')
+    setup_credentials
+    save_cloud_fog
+    #Kernel.system('hpcloud keypairs:add nova')
   end
 end
+
+def setup_credentials
+  puts 'Enter hpcloud username: '
+  hpcloud_os_user = $stdin.gets
+  puts 'Enter hpcloud password: '
+  hpcloud_os_key = $stdin.gets
+
+  home = File.expand_path('~')
+  creds = '%s/.cache/forj/creds' % [home]
+  File.open(creds, 'w') {|file|
+    file.write('HPCLOUD_OS_USER=%s' % [hpcloud_os_user])
+    file.write('HPCLOUD_OS_KEY=%s' % [hpcloud_os_key])
+  }
+end
+
+
+def save_cloud_fog
+  home = File.expand_path('~')
+
+  cloud_fog = '%s/.cache/forj/master.forj-13.5' % [home]
+  local_creds = '%s/.cache/forj/creds' % [home]
+
+  creds = '%s/.hpcloud/accounts/hp' % [home]
+  template = YAML.load_file(creds)
+  local_template = YAML.load_file(local_creds)
+
+
+  access_key = template[:credentials][:account_id]
+  secret_key = template[:credentials][:secret_key]
+
+  os_user = local_template['HPCLOUD_OS_USER']
+  os_key = local_template['HPCLOUD_OS_KEY']
+
+  File.open(cloud_fog, 'w') {|file|
+    file.write('HPCLOUD_OS_USER=%s' % [os_user])
+    file.write('HPCLOUD_OS_KEY=%s' % [os_key])
+    file.write('DNS_KEY=%s' % [access_key])
+    file.write('DNS_SECRET=%s' % [secret_key])
+  }
+
+  command = 'cat  %s | gzip -c | base64 -w0 > %s.g64' % [cloud_fog, cloud_fog]
+  Kernel.system(command)
+end

data/lib/ssh.rb

@@ -18,11 +18,16 @@
 require 'rubygems'
 require 'require_relative'
 
+require_relative 'log.rb'
+include Logging
+
 #
 # ssh module
 #
 module Ssh
   def connect(name, server)
+    msg = 'logging into %s : %s' % [name, server]
+    Logging.info(msg)
     current_dir = Dir.pwd
     Dir.chdir(current_dir + '/lib')
 

data/lib/ssh.sh

@@ -22,9 +22,10 @@ GRE="\e[92m"
 OW=`date +%Y-%m-%d.%H%M%S`
 logpath=~/.ssh/
 DB=~/hosts
-key_path=~/.ssh/
+#key_path=~/.ssh/
+#key_path=~/.hpcloud/keypairs/
 init_config=~/ssh_init
-key="nova"
+key="nova.pem"
 
 if [ ! -f $DB ]; then
 	cat > $DB <<'EOF'

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@
 #
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
+# will add to the boot time of your test.rb suite on EVERY test.rb run, even for an
 # individual file that may not need all of that loaded. Instead, make a
 # separate helper file that requires this one and then use it only in the specs
 # that actually need it.
@@ -48,7 +48,7 @@ RSpec.configure do |config|
 
   # Seed global randomization in this process using the `--seed` CLI option.
   # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
+  # test.rb failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
 
@@ -62,7 +62,7 @@ RSpec.configure do |config|
     expectations.syntax = :expect
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
+  # rspec-mocks config goes here. You can use an alternate test.rb double
   # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
     # Enable only the newer, non-monkey-patching expect syntax.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
   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: &14971980 !ruby/object:Gem::Requirement
+  requirement: &4634460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *14971980
+  version_requirements: *4634460
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &14971040 !ruby/object:Gem::Requirement
+  requirement: &4633120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *14971040
+  version_requirements: *4633120
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &14969800 !ruby/object:Gem::Requirement
+  requirement: &4629760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *14969800
+  version_requirements: *4629760
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &14966500 !ruby/object:Gem::Requirement
+  requirement: &4629180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *14966500
+  version_requirements: *4629180
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &14965860 !ruby/object:Gem::Requirement
+  requirement: &4628460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *14965860
+  version_requirements: *4628460
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &14965120 !ruby/object:Gem::Requirement
+  requirement: &4627320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *14965120
+  version_requirements: *4627320
 description: forj command line
 email:
 - forj@forj.io
@@ -86,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/forj
+- lib/compute.rb
 - lib/connection.rb
 - lib/network.rb
 - lib/security.rb
@@ -99,6 +100,7 @@ files:
 - lib/ssh.sh
 - lib/log.rb
 - lib/helpers.rb
+- lib/build_tmpl/build-env.py
 - spec/boot_spec.rb
 - spec/connection_spec.rb
 - spec/down_spec.rb