forj 0.0.18 → 0.0.19

data/bin/forj

@@ -63,6 +63,7 @@ class Forj < Thor
   desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
   method_option :build_conf_dir, :aliases => '-c', :desc => 'build config dir to use'
   method_option :branch, :aliases => '-b', :desc => 'branch to use'
+  method_option :test_box, :aliases => '-t', :desc => 'test box'
   def boot(blueprint, on, cloud_provider, as, name, test=false)
     build_conf_dir = options[:build_conf_dir]
     branch = options[:branch]
@@ -82,6 +83,11 @@ class Forj < Thor
     Down.down(name)
   end
 
+  desc 'ssh', ''
+  def ssh
+    puts 'ssh'
+  end
+
   desc 'setup', 'set the credentials for forj cli'
   def setup
     Setup.setup

data/lib/boot.rb

@@ -30,55 +30,66 @@ include Repositories
 
 module Boot
   def boot(blueprint, cloud_provider, name, build_config_dir, branch, test=false)
-    puts 'booting %s on %s' % [blueprint, cloud_provider]
-    # boot maestro
-
-    # get definitions from yaml
-    forj_dir = File.expand_path(File.dirname(__FILE__))
-    Dir.chdir(forj_dir)
-    definitions = YamlParse.get_values('../lib/catalog.yaml')
-
-    # clone the maestro repo
-    Repositories.clone_repo
-
-    # upload the keypair
-    SecurityGroup.upload_keypair(definitions[blueprint]['keypair'])
-
-    # create the network where maestro will land
-    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)
-
-    # create the security groups for the blueprint
-    security_group = SecurityGroup.create_security_group(blueprint)
-
-    for port in definitions[blueprint]['ports'] do
-      Network.create_security_group_rule(security_group.id, 'tcp', port, port)
+    begin
+
+      puts 'booting %s on %s' % [blueprint, cloud_provider]
+
+      # get definitions from yaml
+      forj_dir = File.expand_path(File.dirname(__FILE__))
+      Dir.chdir(forj_dir)
+      definitions = YamlParse.get_values('../lib/catalog.yaml')
+
+      # clone the maestro repo
+      Repositories.clone_repo
+
+      # create the network where maestro will land
+      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)
+
+      # create the security groups for the blueprint
+      security_group = SecurityGroup.create_security_group(blueprint)
+
+      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']
+
+      # run build.sh to boot maestro
+      current_dir = Dir.pwd
+      home = File.expand_path('~')
+      build_path = home + '/.hpcloud/maestro/build'
+      Dir.chdir(build_path)
+
+      if build_config_dir != nil
+        command = 'bin/build.sh --build_ID maestro.%s --box-name maestro --build-conf-dir %s --build-config box-13.5 --gitBranch %s' % [name, build_config_dir, branch]
+      else
+        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.hpcloud/maestro/build/conf --build-config box' % [name]
+      end
+
+      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)
+      end
+
+    rescue SystemExit, Interrupt
+      puts 'process interrupted by user'
+    rescue Exception => e
+      puts e
     end
 
-    # run build.sh to boot maestro
-    current_dir = Dir.pwd
-    home = File.expand_path('~')
-    build_path = home + '/.hpcloud/maestro/build'
-    Dir.chdir(build_path)
-
-    if build_config_dir != nil
-      command = './bin/build.sh --build_ID maestro.10 --box-name maestro --build-conf-dir %s --build-config box --setBranch %s' % [build_config_dir, branch]
-    else
-      command = './bin/build.sh --build_ID maestro.10 --box-name maestro --build-config box'
-    end
-
-
-    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_security_group(security_group.id)
-    end
   end
+
 end

data/lib/catalog.yaml

@@ -15,7 +15,7 @@
 redstone:
   image: proto2b
   flavor: standard.xsmall
-  ports: [22, 80, 8080, 8000]
+  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
 

data/lib/connection.rb

@@ -24,7 +24,7 @@ module Connection
 
   def compute
     credentials = get_credentials
-    compute = Fog::Compute.new ({
+    Fog::Compute.new({
         :provider        => 'HP',
         :hp_access_key   => credentials['access_key'],
         :hp_secret_key   => credentials['secret_key'],
@@ -37,7 +37,7 @@ module Connection
 
   def network
     credentials = get_credentials
-    network = Fog::HP::Network.new ({
+    Fog::HP::Network.new({
         :hp_access_key   => credentials['access_key'],
         :hp_secret_key   => credentials['secret_key'],
         :hp_auth_uri     => credentials['auth_uri'],
@@ -50,18 +50,18 @@ end
 
 def get_credentials
   home = File.expand_path('~')
-  file = home + '/.hpcloud/.hpcloud'
-  template = YAML.load_file(file)
+  creds = '%s/.hpcloud/accounts/hp' % [home]
+  template = YAML.load_file(creds)
   credentials = Hash.new
 
   begin
-    credentials['access_key'] = template['default']['access_key']
-    credentials['secret_key'] = template['default']['secret_key']
-    credentials['auth_uri'] = template['default']['auth_uri']
-    credentials['tenant_id'] = template['default']['tenant_id']
-    credentials['availability_zone'] = template['default']['availability_zone']
+    credentials['access_key'] = template[:credentials][:account_id]
+    credentials['secret_key'] = template[:credentials][:secret_key]
+    credentials['auth_uri'] = template[:credentials][:auth_uri]
+    credentials['tenant_id'] = template[:credentials][:tenant_id]
+    credentials['availability_zone'] = template[:regions][:monitoring]
   rescue
-    puts 'your credentials are not configured, delete the file %s and run forj setup again' % [file]
+    puts 'your credentials are not configured, delete the file %s and run forj setup again' % [creds]
   end
 
   credentials

data/lib/network.rb

@@ -22,7 +22,7 @@ include Connection
 module Network
 
   def create_network(name)
-    network = Connection.network.networks.create(:name => name)
+    Connection.network.networks.create(:name => name)
   end
 
   def delete_network(network_name)
@@ -31,7 +31,7 @@ module Network
   end
 
   def create_subnet(network_id, name)
-    subnet = Connection.network.subnets.create(
+    Connection.network.subnets.create(
         :network_id => network_id,
         :name => name,
         :cidr => get_next_subnet,
@@ -44,20 +44,22 @@ module Network
   end
 
   def get_subnet(name)
-    subnet = Connection.network.subnets.all(:name => name)[0]
+    Connection.network.subnets.all(:name => name)[0]
   end
 
   def get_router(name)
     routers = Connection.network.routers.all({:name => name})
     router = nil
-    for r in routers do
+
+    routers.each do|r|
       router = r
     end
+
     router
   end
 
   def create_router_interface(subnet_id, router)
-    interface = router.add_interface(subnet_id, nil)
+    router.add_interface(subnet_id, nil)
   end
 
   def delete_router_interface(subnet_id, router)
@@ -65,7 +67,7 @@ module Network
   end
 
   def create_router(name)
-    router = Connection.network.routers.create(
+    Connection.network.routers.create(
         :name => name,
         :admin_state_up => true
     )

data/lib/security.rb

@@ -24,19 +24,11 @@ include Connection
 module SecurityGroup
 
   def create_security_group(name)
-    security_groups = Connection.network.security_groups.all({:name => name})
-    security_group = nil
-
-    if security_groups.length >= 1
-      security_group = security_groups[0]
-    else
-      description = 'Security group for blueprint %s' % [name]
-      security_group = Connection.network.security_groups.create(
-          :name => name,
-          :description => description
-      )
-    end
-    security_group
+    description = 'Security group for blueprint %s' % [name]
+    Connection.network.security_groups.create(
+        :name => name,
+        :description => description
+    )
   end
 
   def delete_security_group(security_group_id)
@@ -45,7 +37,7 @@ module SecurityGroup
 
   def create_security_group_rule(security_group_id, protocol, port_min, port_max)
     begin
-      rule = Connection.network.security_group_rules.create(
+      Connection.network.security_group_rules.create(
           :security_group_id => security_group_id,
           :direction => 'ingress',
           :protocol => protocol,
@@ -53,7 +45,7 @@ module SecurityGroup
           :port_range_max => port_max,
           :remote_ip_prefix => '0.0.0.0/0'
       )
-    rescue StandardError => e
+    rescue StandardError
       puts 'error creating the rule for port %s' % [port_min]
     end
 
@@ -70,7 +62,7 @@ module SecurityGroup
       # this will create a new keypair
       key_pair = Connection.compute.key_pairs.create(:name => name)
       key_pair.write(path)
-    rescue StandardError => e
+    rescue StandardError
       puts 'error uploading the keypair'
     end
   end

data/lib/setup.rb

@@ -16,91 +16,7 @@
 
 module Setup
   def setup
-    create_dir
-    create_credentials_file
-
-    file = get_credentials_file
-    template = YAML.load_file(file)
-
-    # access key
-    begin
-      access_key = template['default']['access_key']
-    rescue
-      puts 'which access key to use'
-      access_key = $stdin.gets.chomp
-      save_to_credentials_file('access_key', access_key)
-    end
-
-    # secret key
-    begin
-      secret_key = template['default']['secret_key']
-    rescue
-      puts 'which secret_key key to use'
-      secret_key = $stdin.gets.chomp
-      save_to_credentials_file('secret_key', secret_key)
-    end
-
-    # auth uri
-    begin
-      auth_uri = template['default']['auth_uri']
-    rescue
-      puts 'which auth url to use'
-      auth_uri = $stdin.gets.chomp
-      save_to_credentials_file('auth_uri', auth_uri)
-    end
-
-    # tenant id
-    begin
-      tenant_id = template['default']['tenant_id']
-    rescue
-      puts 'which tenant id to use'
-      tenant_id = $stdin.gets.chomp
-      save_to_credentials_file('tenant_id', tenant_id)
-    end
-
-    # availability zone
-    begin
-      availability_zone = template['default']['availability_zone']
-    rescue
-      puts 'which availability zone to use'
-      availability_zone = $stdin.gets.chomp
-      save_to_credentials_file('availability_zone', availability_zone)
-    end
-
-  end
-end
-
-def create_credentials_file
-  home = File.expand_path('~')
-  file = home + '/.hpcloud/.hpcloud'
-
-  unless File.file?(file)
-    File.open(file, 'w') do |f|
-      f.write('default:' + "\n")
-    end
-  end
-end
-
-
-def create_dir
-  home = File.expand_path('~')
-  path = home + '/.hpcloud'
-  unless File.directory?(path) do
-      Dir.mkdir(path)
-    end
+    Kernel.system('hpcloud account:setup')
+    Kernel.system('hpcloud keypairs:add nova')
   end
 end
-
-def get_credentials_file
-  home = File.expand_path('~')
-  file = home + '/.hpcloud/.hpcloud'
-end
-
-def save_to_credentials_file(key, value)
-  home = File.expand_path('~')
-  file = home + '/.hpcloud/.hpcloud'
-
-  File.open(file, 'a') do |f|
-    f.write('    ' + key + ': ' + value + "\n")
-  end
-end

data/lib/ssh.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# (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.

data/lib/yaml_parse.rb

@@ -18,6 +18,6 @@ require 'yaml'
 
 module YamlParse
   def get_values(path_to_yaml)
-    template = YAML.load_file(path_to_yaml)
+    YAML.load_file(path_to_yaml)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   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: &8047180 !ruby/object:Gem::Requirement
+  requirement: &18152220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *8047180
+  version_requirements: *18152220
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &8046480 !ruby/object:Gem::Requirement
+  requirement: &18149360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.22.1
   type: :runtime
   prerelease: false
-  version_requirements: *8046480
+  version_requirements: *18149360
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &8045600 !ruby/object:Gem::Requirement
+  requirement: &18147220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *8045600
+  version_requirements: *18147220
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &8045080 !ruby/object:Gem::Requirement
+  requirement: &18145480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *8045080
+  version_requirements: *18145480
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &8044540 !ruby/object:Gem::Requirement
+  requirement: &18144380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *8044540
+  version_requirements: *18144380
 description: forj command line
 email:
 - forj@forj.io
@@ -85,6 +85,7 @@ files:
 - lib/boot.rb
 - lib/setup.rb
 - lib/repositories.rb
+- lib/ssh.rb
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.