forj 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 998ddeee3c77bd0d8e98530ff7cff93a8fcc984c
-  data.tar.gz: bc302480b7d7f348f6d6a014c42b2084d728ff28
+  metadata.gz: a062220b32731df2805ca604f0f0cb2233613075
+  data.tar.gz: d5c331135e78162961bc967e328530127aeacb0c
 SHA512:
-  metadata.gz: 54cbd2285c243d19bdac2dfa2a23abb7eb0844309c1bfcf71f5aa1d8a88c5e1d36dab36f4c6c341533a169e4c17120fa21714995e1e5a533eab48b321b045862
-  data.tar.gz: 3f942f2dfde94c97074488914c0ffd42ce7fe463a5a26dbd8f5d11b3a096867090678b741e45d1e3864d1c24fccf437bedf5ec4afb7fbd7d66c1d21766b60566
+  metadata.gz: 12720b05fba4b2f5fd348039db09f2900984f080da139d9b3c48fecc67b0eb9c2cf7d788af47f6abb6dd19b8dc5896e284ee114f7e06746e02ac27d2fcdc9f62
+  data.tar.gz: 7980b5830ec4de440b24e8baa7cade68ff3df6eee1c7c287abd221e0494e2e471ec80417de0259479b9928dd8560e3f67eb64e89489a7a74a1bef1b4cb8196b5

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.12'
-  s.date        = '2015-05-22'
+  s.version     = '1.0.13'
+  s.date        = '2015-05-26'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 

data/lib/boot.rb

@@ -253,9 +253,9 @@ pwd
       res_found = param.match(/^(.*)#(.*)$/)
 
       if res_found
-        cert_file = res_found[1]
+        cert_file = File.expand_path(res_found[1])
       else
-        cert_file = param
+        cert_file = File.expand_path(param)
       end
 
       unless File.readable?(cert_file)

data/lib/process/forj_core/data.yaml

@@ -30,7 +30,7 @@
         Maestro gardener is currently configured to access your cloud Compute service with fog openstack.
         Fog openstack is compatible with hpcloud services
 
-        It requires the openstack project name, user and password.
+        It requires the openstack uri, project name, user and password.
     :bp_config:
       :desc:    "Maestro and blueprint configuration:"
     :maestro_access_config:
@@ -120,6 +120,7 @@
       :account:            true
       :required:           true
       :ask_step:           :provider_config
+  :gardener:
     :os_user:
       :desc:               "Openstack compute cloud User name"
       :account_exclusive:  true
@@ -128,6 +129,7 @@
       :validate:           !ruby/regexp /\w+/
       :ask_step:           :gardener_config
       :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#account_id']:nil %>"
+      :ask_sort:           2
     :os_enckey:
       :desc:               "Openstack compute cloud password"
       :account_exclusive:  true
@@ -136,6 +138,22 @@
       :required:           true
       :ask_step:           :gardener_config
       :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#account_key']:nil %>"
+      :ask_sort:           3
+    :os_auth_uri:
+      :desc:               "Openstack service auth url"
+      :explanation:        |-
+        If needed, you can set a different way for Maestro to authenticate itself to the cloud
+
+        Currently, Gardener supports only openstack cloud type, with authentication version 2.
+        Multiple provider support and Openstack authentication v3 will be implemented soon.
+      :account_exclusive:  true
+      :account:            true
+      :required:           true
+      :ask_sort:           0
+      :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#auth_uri']:nil %>"
+      :validate:           !ruby/regexp /v2.0\/tokens/
+      :ask_step:           :gardener_config
+
 
   # Defines DNS services for maestro
   :dns:
@@ -161,11 +179,11 @@
   # Defines maestro environment.
   :maestro:
     :tenant_name:
-      :desc:            "Tenant name required by fog/openstack on gardener"
+      :desc:            "Tenant name"
       :account:         true
       :validate:        !ruby/regexp /^\w?[\w_:-]*$/
       :ask_step:        :gardener_config
-      :ask_sort:        0
+      :ask_sort:        1
       :default_value:   "<%= (config[:provider] == 'openstack')?config['credentials#tenant']:nil %>"
     :network_name:
       :desc:            "Network name to attach to each forge boxes. By default we use 'forj'. If it doesn't exist, it will be created."

data/lib/process/forj_core/process/ca_root_cert.rb

@@ -30,9 +30,10 @@ class ForjCoreProcess
     res_found = cert_file.match(/^(.*)#(.*)$/)
 
     if res_found
-      cert_file = res_found[1]
+      cert_file =  File.expand_path(res_found[1])
       dest_file = "/tmp/#{File.basename(res_found[2])}"
     else
+      cert_file = File.expand_path(cert_file)
       dest_file = File.basename(cert_file)
     end
 

data/lib/process/forj_core/process/declare.rb

@@ -57,8 +57,9 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   obj_needs :data,   'dns#domain_name'
   obj_needs :data,   'maestro#tenant_name'
   # sent in base64
-  obj_needs :data,   'credentials#os_user'
-  obj_needs :data,   'credentials#os_enckey'
+  obj_needs :data,   'gardener#os_user'
+  obj_needs :data,   'gardener#os_enckey'
+  obj_needs :data,   'gardener#os_auth_uri'
   obj_needs :data,   'credentials#account_id'
   obj_needs :data,   'credentials#account_key'
   obj_needs :data,   'credentials#auth_uri'

data/lib/process/forj_core/process/forj_process.rb

@@ -568,10 +568,13 @@ class ForjCoreProcess
   def load_hpcloud(hParams, os_key)
     hpcloud_priv = nil
     IO.popen('gzip -c', 'r+') do|pipe|
-      pipe.puts(format('HPCLOUD_OS_USER=%s', hParams['credentials#os_user']))
-      pipe.puts(format('HPCLOUD_OS_KEY=%s', os_key))
-      pipe.puts(format('DNS_KEY=%s', hParams[:'credentials#account_id']))
-      pipe.puts(format('DNS_SECRET=%s', hParams['credentials#account_key']))
+      data = <<-END
+HPCLOUD_OS_USER='#{hParams['gardener#os_user']}'
+HPCLOUD_OS_KEY='#{os_key}'
+DNS_KEY='#{hParams[:'credentials#account_id']}'
+DNS_SECRET='#{hParams['credentials#account_key']}'
+      END
+      pipe.puts(data)
       pipe.close_write
       hpcloud_priv = pipe.read
     end
@@ -594,9 +597,10 @@ class ForjCoreProcess
       'PUPPET_DEBUG' => 'True',
       'image_name' => hParams['maestro#image_name'],
       'key_name' => hParams['credentials#keypair_name'],
+      # The following is used by gardener
       # Remove pad
       'hpcloud_priv' => Base64.strict_encode64(hpcloud_priv).gsub('=', ''),
-      'compute_os_auth_url' => hParams['credentials#auth_uri']
+      'compute_os_auth_url' => hParams['gardener#os_auth_uri']
     }
 
     if hParams['dns#dns_service']
@@ -628,7 +632,7 @@ class ForjCoreProcess
   def build_metadata(sObjectType, hParams)
     entr = load_encoded_key
 
-    os_enckey = hParams['credentials#os_enckey']
+    os_enckey = hParams['gardener#os_enckey']
 
     os_key = decrypt_key(os_enckey, entr)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor