forj 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109aaca45df11251c58c7dc0a609e70b8f00464c
-  data.tar.gz: b1e2012cbc1e679e2aa3d15a009090ddb6082b7e
+  metadata.gz: 70f1b264464790bfae435e9dcfb4fda06d646bc7
+  data.tar.gz: 1e54b8faf466d33cb3147b38a26473a2fd368319
 SHA512:
-  metadata.gz: 184323727e5d66392e42d3f9a350e2dee1aad85949e0261cb6fc8e4f211209193fd61674dafcda7d12573cd93b27de76ef68ad8c0075e7726049c7120033c3ba
-  data.tar.gz: 75236938deada281404745ca1bda29cd5c19f432f2c20dba20851837864b0d453bee63b968d410fa294685f6143653ad0efa643e23c50d267fb3e9a2bc081ae4
+  metadata.gz: b539bf62bd365a93000a0b5abf5883f4328d624fa5577f621add143fbaadfa309bc881b86f2984a91a6062aaef048ef8190d7895dd16f677e3ec391a3d9e1c2e
+  data.tar.gz: a42889ff7406624e986c36c59c13b9bb683509e129cfbc8ef8be42407bd6f267f75d3a6475390a38dfa5542bd556b0a5e2083841ae01169c0940be8bdaa32d7e

data/README.md

@@ -72,16 +72,17 @@ Quick steps: How to create a forj?
     - *hpcloud* : Use this provider for http://www.hpcloud.com/, or hphelion.
       Uses Access key and secret key authentication mechanism.
 
-        - [hp public cloud|http://www.hpcloud.com/] from HP. Tested successfully.
+        - [hp public cloud](http://www.hpcloud.com/) from HP. Tested successfully.
+        - [hphelion](http://www8.hp.com/us/en/cloud/helion-overview.html) from HP. Not tested with access keys.
 
     - *openstack*: Use this provider to access any openstack installation (public or private) or Hphelion (public or private)
         Uses login and password authentication system
 
         If you want to test against a new local openstack cloud, you can consider :
 
-        - [packstack|https://wiki.openstack.org/wiki/Packstack] from RedHat. Can be used for a notebook local installation. tested successfully.
-        - [hphelion|http://www8.hp.com/fr/fr/cloud/helion-overview.html] from HP. Tested successfully
-        - [Ubuntu OpenStack|http://www.ubuntu.com/cloud] from Canonical. Not tested.
+        - [packstack](https://wiki.openstack.org/wiki/Packstack) from RedHat. Can be used for a notebook local installation. tested successfully.
+        - [hphelion](http://www8.hp.com/us/en/cloud/helion-overview.html) from HP. Tested successfully with user/password.
+        - [Ubuntu OpenStack](http://www.ubuntu.com/cloud) from Canonical. Not tested.
 
     For any other cloud, you need a provider in lorj library. Contribute to create a new provider!
     See

data/forj.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name        = 'forj'
   s.homepage = 'https://www.forj.io'
 
-  s.version     = '1.0.6'
-  s.date        = '2015-03-18'
+  s.version     = '1.0.7'
+  s.date        = '2015-03-23'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '1.7.5'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'nokogiri','1.5.11'
-  s.add_runtime_dependency 'lorj', '~> 1.0.6'
+  s.add_runtime_dependency 'lorj', '~> 1.0.7'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"

data/lib/forj/process/ForjProcess.rb

@@ -110,15 +110,17 @@ class ForjCoreProcess
                      keypair_coherent, s_status
   )
     if o_server[:attrs][:status] == :active
+      image = server_get_image o_server
+
       s_msg = <<-END
 Your forj Maestro server is up and running and is publically accessible
 through IP '%s'.
 
 You can connect to '%s' with:
-ssh ubuntu@%s -o StrictHostKeyChecking=no -i %s
+ssh %s@%s -o StrictHostKeyChecking=no -i %s
       END
       s_msg = format(s_msg, o_address[:public_ip], o_server[:name],
-                     o_address[:public_ip], private_key_file
+                     image[:ssh_user], o_address[:public_ip], private_key_file
       )
 
       unless keypair_coherent
@@ -283,7 +285,7 @@ class ForjCoreProcess
       end
     end
 
-    image = data_objects[:image, :ObjectData]
+    image = data_objects(:image, :ObjectData)
     s_msg = <<-END
 Public IP for server '%s' is assigned.
 Now, as soon as the server respond to the ssh port,
@@ -294,7 +296,7 @@ do
  sleep 5
 done
     END
-    s_msg = format(s_msg, o_server[:name], image[:user],
+    s_msg = format(s_msg, o_server[:name], image[:ssh_user],
                    o_address[:public_ip], boot_options[:keys]
     )
     unless boot_options[:coherent]
@@ -494,6 +496,7 @@ class ForjCoreProcess
 
   def load_h_meta(hParams, hpcloud_priv)
     h_meta = {
+      'flavor_name' => hParams[:bp_flavor],
       'cdksite' => config.get(:server_name),
       'cdkdomain' => hParams[:domain_name],
       'eroip' => '127.0.0.1',

data/vagrant/ubuntu/Vagrantfile

@@ -82,6 +82,7 @@ Vagrant.configure(2) do |config|
     config.proxy.no_proxy = ENV['no_proxy'] if ENV.key?('no_proxy')
   end
   priv = { privileged: true }
+  config.vm.provision "shell", priv.merge(inline: "apt-get update")
   config.vm.provision "shell", priv.merge(inline: "apt-get install ruby1.9.1 ruby1.9.1-dev rubygems1.9.1 build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev libxml2-dev libxslt-dev git -y")
   config.vm.provision "shell", priv.merge(inline: "gem install bundler --no-rdoc --no-ri")
   config.vm.provision "shell", priv.merge(inline: "gem install rake --no-rdoc --no-ri")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement