forj 0.0.28 → 0.0.29

data/README.md

@@ -6,9 +6,6 @@ How to use it
 =====================
 
 
-FORJ Team
-
-
 Contributing to Forj
 =====================
 We welcome all types of contributions.  Checkout our website (http://docs.forj.io/en/latest/dev/contribute.html)

data/bin/forj

@@ -32,30 +32,44 @@ include Ssh
 class Forj < Thor
   desc 'help', 'Display forj cli help'
   def help
-    puts 'forj cli commands'
-    puts '    -action:'
-    puts '        boot: boot a Maestro box and instruct it to provision the blueprint'
-    puts '            -blueprint: which blueprint to use'
-    puts '            -on: just because :)'
-    puts '            -cloud_provider: cloud provider type to be used to provision the forge.'
-    puts '                - hpcloud: uses HP public cloud http://hpcloud.com/'
-    puts '                - openstack: OpenStack based private or public cloud'
-    puts '                - more to come'
-    puts '            -as: just because :)'
-    puts '            -name: name for the maestro box'
-    puts '            -test: this will delete everything after it finish to install the forge'
-    puts '            example: forj boot redstone on hpcloud as redstone01'
-    puts '        down: delete the Maestro box and all systems installed by the blueprint'
-    puts '            -name: name for the maestro box'
-    puts '        setup: set the credentials for forj cli'
-    puts '            -credentials:'
-    puts '              hpcloud:'
-    puts '                  access_key: access key from hpcloud'
-    puts '                  secret_key: secret key from hpcloud'
-    puts '                  auth_uri: identity endpoint'
-    puts '                  tenant_id: id for the tenant you want to use'
-    puts '                  availability_zone: which availability zone will be deployed'
+    puts 'Forj cli help'
     puts ''
+    puts '  forj setup   # Set the credentials for forj.'
+    puts '    required credentials:'
+    puts '      access_key: access key from hpcloud'
+    puts '      secret_key: secret key from hpcloud'
+    puts '      auth_uri: identity endpoint'
+    puts '      tenant_id: id for the tenant you want to use'
+    puts '      availability_zone: which availability zone will be deployed'
+    puts ''
+    puts '  forj boot    # Boot a new forge with the following options'
+    puts '    required:'
+    puts '      blueprint: name of the blueprint (currently cli only supports redstone)'
+    puts '      on: just to have a natural description'
+    puts '      cloud_provider: in which cloud provider to deploy the forge'
+    puts '      as: just to have a natural description'
+    puts '      name: name of the forge'
+    puts '    example:'
+    puts '      forj boot redstone on hpcloud as maestro_test'
+    puts '    optional:'
+    puts '      -b build: replace the default build.sh'
+    puts '      -bcd build_config_dir: defines the build configuration directory to load the build configuration file'
+    puts '      -bc build_config: the build config file to load <confdir>/<BoxName>.<Config>.env.'
+    puts '      -gb branch: the build will extract from git branch name'
+    puts '      -tb test_box (not yet implemented): create test-box meta from the repository path provided.'
+    puts '      -gr git_repo: the box built will use a different git repository sent out to <user_data>'
+    puts '      -bh boothook: by default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
+    puts '      -bn box_name: defines the name of the box or box image to build.'
+    puts ''
+    puts '  forj ssh     # Connect through ssh to an existing instance'
+    puts '    required:'
+    puts '      name: name of the forge (maestro_test)'
+    puts '      node: name of the node (maestro, ci, etc...)'
+    puts ''
+    puts '  forj down    # Delete a forge and create a backup of your data'
+    puts '    not yet implemented'
+    puts ''
+    puts '  forj help    # Display this help'
   end
 
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
@@ -66,7 +80,7 @@ class Forj < Thor
   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 => '-b',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
+  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.'
 
   def boot(blueprint, on, cloud_provider, as, name, test = false)
@@ -83,8 +97,8 @@ class Forj < Thor
   end
 
   desc 'ssh', 'connect to your forge thru ssh'
-  def ssh
-    Ssh.connect
+  def ssh(name, server)
+    Ssh.connect(name, server)
   end
 
   desc 'setup', 'set the credentials for forj cli'

data/lib/catalog.yaml

@@ -18,6 +18,7 @@ redstone:
   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
   router: private-ext
+  nodes: [maestro, ci, util, review]
 
 modus:
   ports: []

data/lib/ssh.rb

@@ -15,11 +15,24 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
+require 'require_relative'
+
 #
 # ssh module
 #
 module Ssh
-  def connect
-    puts 'ssh'
+  def connect(name, server)
+    current_dir = Dir.pwd
+    Dir.chdir(current_dir + '/lib')
+
+    update = './ssh.sh -u'
+    connection = './ssh.sh %s %s' % [name, server]
+
+    # update the list of servers
+    Kernel.system(update)
+
+    # connect to the server
+    Kernel.system(connection)
   end
 end

data/lib/ssh.sh

@@ -0,0 +1,183 @@
+#!/bin/bash
+#vim: setlocal ft=sh:
+RST="\e[0m"
+RED="\e[31m"
+BLU="\e[34m"
+GRE="\e[92m"
+
+# (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.
+
+OW=`date +%Y-%m-%d.%H%M%S`
+logpath=~/.ssh/
+DB=~/hosts
+key_path=~/.ssh/
+init_config=~/ssh_init
+key="nova"
+
+if [ ! -f $DB ]; then
+	cat > $DB <<'EOF'
+
+#Custom Servers - (Won't be deleted when updating list)
+#<name.id>         <public ip>       <date>           <key>
+
+#### Below list are updated
+
+EOF
+fi
+
+##No parameters sent
+if (( $# < 1 )); then
+	echo -e "${RED}Error, no parameter was sent.$RST"
+	echo "Use this script as:"
+	echo "  -rm <id> : Removes all nodes that match the id."
+	echo "  -f <text>: Finds the text in the log files."
+	echo "  -u       : Updates the hosts list querying nova server."
+	echo "  -l       : Lists the current hosts."
+	echo "  <IP>     : Connects directly to the IP using default key"
+	echo "<id> <name>: Queries the hosts list looking for the id and name."
+	echo -e "\n ${GRE}OPTIONS${RST}"
+	echo "  -i {par} : Applies initialization script to the server."
+	exit 1
+fi
+
+if [ $1 == '-i' ]; then
+	if [ ! -f $init_config ]; then
+		echo "${RED}Error, config file: $init_config does not exists."
+		exit 1
+	fi
+	shift
+	is_init='true'
+fi
+
+#Finds text in logs
+if [ $1 == '-f' ]; then
+	grep --include=*.log -rnw $logpath -e "$2" --color=always
+	exit 0
+fi
+
+if [ $1 == '-rm' ] && [ "$2" != '' ]; then
+	echo "Removing $2..."
+	cat $DB | grep -iE "[a-z]+\.$2" --color=always
+	sed -i -E "/[a-z]+\.$2/d" $DB
+	exit 0
+fi
+
+##Just Lists the hosts db
+if [ $1 == '-l' ]; then
+	echo "List of hosts:"
+	if [ "$2" != "" ]; then #kit
+		result=$(cat $DB | grep -iE "\.$2" --color=always)
+	else #All Maestros
+		result=$(cat $DB | grep -E "maestro\.")
+	fi
+	echo "$result"
+	exit 0
+fi
+
+##Just list the hosts db
+if [ $1 == '-u' ]; then
+	linenum=$(cat $DB | grep -E -n "#### Below list are updated" | awk -F: '{print $1}')
+	old_serversnum=$(tail -n +$linenum $DB | grep -E " .*\..* " | wc -l)
+
+	sed -i -n '/\#\#\#\# Below list are updated/q;p' $DB
+	sed -i '/^$/d' $DB
+	echo -e "\n#### Below list are updated" >> $DB
+
+	hpcloud servers | awk -F"\|" '{print $3","$6","$9","$7}' | awk -F, '{print $1$3$4$5}' >> $DB
+	echo -e "\033[1;32m$DB Updated\033[00m"
+	linenum=$(cat $DB | grep -E -n "#### Below list are updated" | awk -F: '{print $1}')
+	new_serversnum=$(tail -n +$linenum $DB | grep -E " .*\..* " | wc -l)
+	diff=$(echo "$new_serversnum - $old_serversnum" | bc)
+	echo "Old Servers: $old_serversnum, New Servers: $new_serversnum, Diff: $diff"
+	exit 0
+fi
+
+#parameter is IP
+if [[ $1 =~ ([0-9]{1,3}\.){3}[0-9]{1,3} ]]; then
+	ip=$1
+	#Check if has URL and clean it if so
+	if [[ $ip =~ 'http' ]]; then
+		ip=$(echo "$ip" | grep -oE '([0-9]{1,3}\.){3}[0-9]{1,3}')
+	fi
+	#Check if IP exists in db and show info
+	host_name=$(cat $DB | grep $ip | awk '{print $1}')
+	if [[ "$host_name" != "" ]]; then
+		echo -e "Host: \033[33m$host_name${RST}"
+	fi
+	message="$ip"
+#parameter is ID NODE
+else
+	id=$1
+	node=$2
+
+	if [ "$node" == "" ]; then
+		echo -e "${RED}Error, no server name sent.$RST"
+		exit 1
+	fi
+
+	#Alias handling
+	alias=$(cat ~/hosts | grep -iE '^alias:' | grep -iE ' '$node | awk '{print $2}')
+	if [ "$alias" != "" ] && [ "$alias" != "$node" ]; then
+		echo "Using alias $node, converting to $alias"
+		node=$alias
+	fi
+
+	ip=$(cat $DB | grep -iE "[a-ZA-Z]+\.$id" | grep -i $node | awk '{print $2}' | tr -d ' ')
+	if [ "$ip" == "" ]; then
+		echo -e "${RED}Error, the kit ${GRE}$node${RED} with id ${GRE}$id${RED} was not found.${RST}"
+		exit 1
+	fi
+	key=$(cat $DB | grep -iE "$ip" | awk '{print $4}' | tr -d ' ')
+	message="$node.$id"
+	extended="($ip)"
+
+	if [ "$ip" == "" ] || [ "$key" == "" ]; then
+		echo -e "${RED}Error, combination was not found, maybe you should update the db.$RST"
+		exit 1
+	fi
+fi
+
+if [ "$node" != "" ]; then
+	logname="$node.$id"
+else
+	logname="$ip"
+fi
+key="$key_path$key.pem"
+
+echo -e "Connecting to $GRE$message$RST using $BLU$key$RST $extended"
+
+if [[ ! -f $key ]]; then
+	echo -e "${RED}Key doesn't exists$RST"
+	exit 1
+fi
+
+logfile="${logpath}sshlog.$logname.$NOW.log"
+
+echo -e "$RED══════════════════════════════════════════════════════════════════════════$RST"
+#echo "ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=180 -i $key ubuntu@$ip"
+if [ "$is_init" == 'true' ]; then
+	username=$(id -u -n)
+	username=${username^^} #convert to upper
+	grep -q "$username" $init_config
+	if [ $? != 0 ]; then
+		echo "Writing username to $init_config file."
+		sed -i "s/^owner='.*'$/owner='$username'/g" $DB
+	fi
+	ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=180 -i $key ubuntu@$ip < $init_config
+	echo -e "Reconnecting..."
+fi
+ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=180 -i $key ubuntu@$ip | tee -a $logfile
+echo -e "$RED══════════════════════════════════════════════════════════════════════════$RST"
+echo -e "${GRE}Log file: ${RST}$logfile"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   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: &11546020 !ruby/object:Gem::Requirement
+  requirement: &12934080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *11546020
+  version_requirements: *12934080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11543820 !ruby/object:Gem::Requirement
+  requirement: &12933440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: *11543820
+  version_requirements: *12933440
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &11542840 !ruby/object:Gem::Requirement
+  requirement: &12932840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *11542840
+  version_requirements: *12932840
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &11541880 !ruby/object:Gem::Requirement
+  requirement: &12932140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *11541880
+  version_requirements: *12932140
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &11540940 !ruby/object:Gem::Requirement
+  requirement: &12931320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *11540940
+  version_requirements: *12931320
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &11537200 !ruby/object:Gem::Requirement
+  requirement: &12930460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *11537200
+  version_requirements: *12930460
 description: forj command line
 email:
 - forj@forj.io
@@ -96,6 +96,7 @@ files:
 - lib/setup.rb
 - lib/repositories.rb
 - lib/ssh.rb
+- lib/ssh.sh
 - lib/log.rb
 - lib/helpers.rb
 - spec/boot_spec.rb