forj 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef0968ac041ad0e35470fa80c10756c638fb911
-  data.tar.gz: 46e08b9cb5d58abc63bc965a9f4fda5b0e173063
+  metadata.gz: 3713a3141ee28056dfc779808c37fbeb2653fb0e
+  data.tar.gz: 17ac0ed878a17cdda2af6928f063b1318a93b202
 SHA512:
-  metadata.gz: d75b1a014f7f03bda260e21bcb1148e9107227c1c5586e3208662a1a9c1c3aa595a78bc3dbf6baafafbf938e7f1ec240bfc56bcd41057a97e31ffa57627babbb
-  data.tar.gz: 920c86b6352be31551ad936a5a1edc678a3787e93254888466c275fee99bbe9a8a4c185c2078a78f19bf45509d78069726a5336bc0ae69a3a571a63715eca860
+  metadata.gz: ee0f4ac5e241c57d7b8b15c9d58ffdf4d55640d6cd58a4ab9c6fc8e207a0903cac2d50a2b1afa3359c2d3c624d72599b4ca1975af7078e494d923f1f917f8d6a
+  data.tar.gz: 7e3067f2f0cdf2a8c5f202ecbf043e55501dc776f1b06bf504126634721ba66a786dcc955aa3d9c8448ea71628b1396b464e0800e47ff1dbfb32063c6be28a13

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.17'
-  s.date        = '2015-06-26'
+  s.version     = '1.0.18'
+  s.date        = '2015-07-02'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -51,7 +51,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_cloud', '>= 0.1.6'
+  s.add_runtime_dependency 'lorj_cloud', '>= 0.1.9'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"

data/lib/process/forj_core/data.yaml

@@ -25,7 +25,7 @@
       :add:
         - :ssh_user
     :gardener_config:
-      :desc:    "Maestro gardener Cloud configuration:"
+      :desc:    "Maestro FOG gardener Cloud configuration:"
       :explanation:        |-
         Maestro gardener is currently the layer used by Maestro to access your cloud.
 
@@ -41,8 +41,8 @@
         As those changes are in transition, the old gardener behavior has been kept and can be re-enabled.
         See 'lorj_disabled' paramater in 'forj get/set' or --disable-lorj from cli.
 
-        In order to switch easily on Maestro between FOG <=> LORJ_CLOUD, setup
-        will still requires the openstack uri, project name, user and password.
+        In order to switch easily and re-activate FOG on gardener, setup will still requires
+        the openstack uri (auth V2.0 only), project name, user and password.
     :bp_config:
       :desc:    "Maestro and blueprint configuration:"
     :maestro_access_config:
@@ -106,6 +106,7 @@
       :ask_step:           :maestro_access_config
       :pre_step_function:  :update_keypair_config
       :post_step_function: :forj_check_cloud_keypair
+      :export:             true
     :auth_uri:
       :desc:               "Generic service auth url"
       :account_exclusive:  true
@@ -113,12 +114,14 @@
       :required:           true
       :ask_sort:           0
       :ask_step:           :provider_config
+      :export:             true
     :account_id:
       :desc:               "Generic Cloud Account name."
       :account_exclusive:  true
       :account:            true
       :required:           true
       :ask_step:           :provider_config
+      :export:             true
     :account_key:
       :desc:               "Generic cloud account key"
       :account_exclusive:  true
@@ -126,15 +129,17 @@
       :required:           true
       :encrypted:          true
       :ask_step:           :provider_config
+      :export:             true
     :tenant:
       :desc:               "Openstack Tenant Name (Project name)"
       :account_exclusive:  true
       :account:            true
       :required:           true
       :ask_step:           :provider_config
+      :export:             true
   :gardener:
     :os_user:
-      :desc:               "Openstack compute cloud User name"
+      :desc:               "Openstack compute cloud User name for Fog Gardener"
       :account_exclusive:  true
       :account:            true
       :required:           true
@@ -143,7 +148,7 @@
       :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#account_id']:nil %>"
       :ask_sort:           2
     :os_enckey:
-      :desc:               "Openstack compute cloud password"
+      :desc:               "Openstack compute cloud password for Fog Gardener"
       :account_exclusive:  true
       :encrypted:          true
       :account:            true
@@ -152,12 +157,9 @@
       :default_value:      "<%= (config[:provider] == 'openstack')?config['credentials#account_key']:nil %>"
       :ask_sort:           3
     :os_auth_uri:
-      :desc:               "Openstack service auth url"
+      :desc:               "Openstack service auth url for Fog Gardener"
       :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.
+        Only Openstack v2.0 authentication is supported by FOG gardener.
       :account_exclusive:  true
       :account:            true
       :required:           true
@@ -175,6 +177,7 @@
          :account:            true
          :post_step_function: :forj_dns_settings
          :ask_step:           :dns_config
+         :export:             true
       :dns_service:
          :desc:               "DNS service region name Maestro will use."
          :account_exclusive:  true
@@ -191,7 +194,7 @@
   :network:
     :webproxy:
       :desc:            "HTTP/HTTPS proxy setting to access internet from your cloud"
-
+      :export:          true
   # Defines maestro environment.
   :maestro:
     :tenant_name:
@@ -208,12 +211,14 @@
       :required:        true
       :default_value:   "forj"
       :ask_step:        :maestro_config
+      :export:          "server#network_name"
     :security_group:
       :desc:            "Security group name to configure and attach to each forge boxes."
       :account:         true
       :validate:        !ruby/regexp /^\w?\w*$/
       :default_value:   "forj"
       :ask_step:        :maestro_config
+      :export:          "server#security_group"
     :ports:
       :desc:            "Ports open in the security groups given."
       :default_value:   [22, 80, 443, 3000, 3131-3135, 4505-4506, 5000, 5666, 8000, 8080-8081, 8083, 8125, 8139-8140, 8773-8776, 9292, 29418, 35357]
@@ -243,6 +248,7 @@
       :desc:       "Maestro Flavor name"
       :default_value:    'medium'
       :account:    true
+      :export:          "server#flavor_name"
       :list_values:
          :query_type:   :query_call # Will execute a query on flavor, query_params is empty for all.
          :object:       :flavor
@@ -272,6 +278,8 @@
 
         Checking image '<%= config['maestro#image_name'] %>'...
       :account:     true
+      :export:             "server#ssh_user"
+
       :ask_step:           :maestro_img_config
       :ask_sort:           0
       :after:              :image_name
@@ -302,15 +310,19 @@
   :server:
     :network_name:
       :get:             false
+      :export:          false
     :security_group:
       :get:             false
+      :export:          false
     :box_name:
       :get:             false
     :flavor_name:
       :get:             false
       :account:         false
+      :export:          false
     :image_name:
       :account:         false
       :get:             false
+      :export:          false
     :ports:
       :get:             false

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

@@ -55,8 +55,7 @@ class ForjCoreProcess
     o_address = hParams.refresh[:public_ip, :ObjectData]
     o_address = Lorj::Data.new if o_address.nil?
 
-    s_status = active_server?(server, o_address, boot_options[:keys],
-                              boot_options[:coherent], s_status)
+    s_status = active_server?(server, o_address, boot_options, s_status)
 
     till_server_active(s_status, hParams, o_address, boot_options)
 
@@ -154,44 +153,32 @@ class ForjCoreProcess
     predef_keypair
   end
 
-  def active_server?(o_server, o_address, private_key_file,
-                     keypair_coherent, s_status
-                    )
+  def active_server?(o_server, o_address, ssh_key, status)
     if o_server[:attrs][:status] == :active
       return :assign_ip if o_address[:public_ip].nil?
 
       image = server_get_image o_server
 
-      s_msg = format('Your forj Maestro server is up and running and is '\
-                     "publically accessible through IP '%s'.\n\n"\
-                     "You can connect to '%s' with:\n"\
-                     'ssh %s@%s -o StrictHostKeyChecking=no -i ',
-                     o_address[:public_ip], o_server[:name],
-                     image[:ssh_user], o_address[:public_ip])
+      s_msg = 'Your forj Maestro server is up and running and is publically'\
+              " accessible through IP '#{o_address[:public_ip]}'."
 
-      if keypair_coherent
-        s_msg += private_key_file
-      else
-        s_msg += ANSI.red(ANSI.bold('<no valid private key found>')) + "\n\n" +
-                 ANSI.bold('Unfortunatelly') + ', Forj was not able to find a '\
-                 'valid keypair to connect to your server.' \
-                 "\nYou need to fix this issue to gain access to your server."
-      end
       PrcLib.info(s_msg)
+      PrcLib.high_level_msg("\n%s\n", s_msg)
 
       o_log = process_get(:server_log, 25)[:attrs][:output]
       if /cloud-init boot finished/ =~ o_log
-        s_status = :active
-        PrcLib.high_level_msg("\n%s\nThe forge is ready...\n", s_msg)
+        status = :active
       else
-        PrcLib.high_level_msg("\n%s\nThe forge is still building...\n", s_msg)
-        s_status = :cloud_init
+        PrcLib.info(server_connect_info(o_server, image, o_address,
+                                        ssh_key, status))
+        PrcLib.high_level_msg("The forge is still building...\n")
+        status = :cloud_init
       end
     else
       sleep 5
-      s_status = :starting
+      status = :starting
     end
-    s_status
+    status
   end
 end
 
@@ -244,6 +231,8 @@ class ForjCoreProcess
     pending_count = 0
     server_error = 0
     o_server = hParams.refresh[:server, :ObjectData]
+    server_name = o_server[:attrs, :name]
+    image = server_get_image o_server
 
     while s_status != :active
       if i_cur_act == 4
@@ -258,7 +247,7 @@ class ForjCoreProcess
       if s_status == :restart
         process_delete(:server)
         PrcLib.message("Bad server '%s' removed. Creating a new one...",
-                       o_server[:name])
+                       server_name)
         sleep(5)
         process_create(:internet_server)
         s_status = :starting
@@ -266,7 +255,10 @@ class ForjCoreProcess
         next
       end
 
-      o_server = load_server(o_server)
+      unless o_server.refresh
+        sleep(5)
+        next
+      end
 
       if o_server[:status] == :error
         if server_error == 1
@@ -275,7 +267,7 @@ class ForjCoreProcess
         server_error = 1
         PrcLib.warning("The creation of server '%s' has currently failed. "\
                        'Trying to rebuild it, once before give up.',
-                       o_server[:name])
+                       server_name)
         s_status = :restart
         next
       end
@@ -300,7 +292,6 @@ class ForjCoreProcess
         lorj_detect(hParams, o_old_log, boot_options)
 
         if pending_count == 60
-          image = server_get_image o_server
           highlight = ANSI.yellow('-' * 40)
           PrcLib.warning("No more server activity detected.\n"\
                          "#{highlight}\n"\
@@ -312,12 +303,17 @@ class ForjCoreProcess
                          "situation.\nYou can connect to the server if you "\
                          "want to.\nTo connect, use:\n"\
                          'ssh %s@%s -o StrictHostKeyChecking=no -i %s',
-                         o_old_log, o_server[:name], image[:ssh_user],
+                         o_old_log, server_name, image[:ssh_user],
                          o_address[:public_ip], boot_options[:keys])
         end
       end
       sleep(5) if s_status != :active
     end
+    PrcLib.info('The Forge build is over!')
+    msg = server_connect_info(o_server, image, o_address, boot_options,
+                              s_status)
+    PrcLib.info(msg)
+    PrcLib.high_level_msg("\nThe forge is ready...\n#{msg}\n")
   end
 
   # Function to get the image data from the server
@@ -336,22 +332,6 @@ class ForjCoreProcess
 
   # rubocop:enable CyclomaticComplexity
   # rubocop:enable PerceivedComplexity
-
-  # Function to get the server, tracking errors
-  #
-  # *return*
-  # - Server found.
-  #
-  def load_server(server)
-    begin
-      found_server = process_get(:server, server[:attrs][:id])
-    rescue => e
-      PrcLib.error(e.message)
-    else
-      return found_server
-    end
-    server
-  end
 end
 
 # Functions for boot - build_forge
@@ -369,30 +349,74 @@ class ForjCoreProcess
       end
     end
     image = hParams.refresh[:image]
-    s_msg = <<-END
-Public IP for server '%s' is assigned.
-Now, as soon as the server respond to the ssh port,
-you will be able to get a tail of the build with:
-while [ 1 = 1 ]
-do
- ssh %s@%s -o StrictHostKeyChecking=no -i %s tail -f /var/log/cloud-init.log
- sleep 5
-done
-    END
-    s_msg = format(s_msg, o_server[:name], image[:ssh_user],
-                   o_address[:public_ip], boot_options[:keys]
-                  )
-    unless boot_options[:coherent]
-      s_msg += ANSI.bold("\nUnfortunatelly") + " your current keypair' \
-            ' is not usable to connect to your server.\nYou need to fix'   \
-            ' this issue to gain access to your server."
-    end
+    s_msg = "Public IP for server '#{o_address[:public_ip]}' is assigned."
+    s_msg += server_connect_info(o_server, image, o_address,
+                                 boot_options, s_status)
+
     PrcLib.info(s_msg)
     PrcLib.high_level_msg("\n%s\nThe forge is still building...\n", s_msg)
     s_status = :cloud_init
     s_status
   end
 
+  # function to print out the ssh connection information to the user
+  #
+  # * *args*:
+  #   - server : Server object with :name
+  #   - image  : Image object with :ssh_user
+  #   - address: Server address with :public_ip
+  #   - ssh_key: Server ssh keys with :keys
+  #   - status : Boot status. If boot status is :active
+  #     the msg will simply display how to connect to.
+  #     otherwise, it display, how to show instant log.
+  #
+  # * *returns*:
+  #   - msg : A composite message to display
+  def server_connect_info(server, image, address, ssh_key, status)
+    server_name = server.nil? ? 'undefined' : server[:name]
+    image_user = image.nil? ? 'undefined' : image[:ssh_user]
+    public_ip = address.nil? ? 'undefined' : address[:public_ip]
+
+    if ssh_key[:coherent]
+      private_key = ssh_key[:keys]
+    else
+      private_key ANSI.red(ANSI.bold('<no valid private key found>'))
+      more = "\n\n" +
+             ANSI.bold('Unfortunatelly') + ', Forj was not able to find a '\
+             'valid keypair to connect to your server.' \
+             "\nYou need to fix this issue to gain access to your server."
+    end
+
+    if status == :active
+      "Maestro is accessible through http://#{public_ip}. This will provide"\
+      " you access to your complete forge implemented by your blueprint.\n\n"\
+      'If you want to access your server through ssh, you have several '\
+      "options:\n- using `forj ssh`\n- using ssh cli with:\n"\
+      "  ssh #{image_user}@#{public_ip} -o StrictHostKeyChecking=no -i "\
+      "#{private_key}\n\n"\
+      "  You can also create a new host in your ssh config with:\n"\
+      "  echo 'host c_#{server_name}\n"\
+      "      hostname #{public_ip}\n"\
+      "      identity_file #{private_key}\n"\
+      "      User #{image_user}\n"\
+      "      # If you need to set a proxy to access this server\n"\
+      "      # ProxyCommand corkscrew web-proxy 8080 %%h %%p' >> "\
+      "~/.ssh/config\n"\
+      "\n  So, you will be able to connect to your server with:\n"\
+      "  ssh c_#{server_name}#{more}\n"
+    else
+      "Your forge is still building...\n"\
+      "Now, as soon as the server respond to the ssh port,\n"\
+      "you will be able to get a tail of the build with:\n"\
+      "while [ 1 = 1 ]\n"\
+      "do\n"\
+      " ssh #{image_user}@#{public_ip} -o StrictHostKeyChecking=no -i "\
+      "#{private_key} tail -f /var/log/cloud-init.log\n"\
+      " sleep 5\n"\
+      "done#{more}"
+    end
+  end
+
   def analyze_log_output(output_options, s_status, hParams)
     o_log = process_get(:server_log, 25)
     return output_options if o_log.nil? || o_log.empty?
@@ -474,30 +498,15 @@ class ForjCoreProcess
     o_address = params[:public_ip, :ObjectData]
     blueprint = params[:blueprint]
     instance_name = params[:instance_name]
-    s_msg = format(
-      "Your Forge '%s' is ready and accessible from" \
-      " IP #{o_address[:public_ip]}.",
-      instance_name
-    )
+    s_msg = "Your Forge '#{instance_name}' is ready and accessible from" \
+            " IP #{o_address[:public_ip]}."
+
     # TODO: read the blueprint/layout to identify which services
     # are implemented and can be accessible.
     if blueprint
-      s_msg += format(
-        "\n" + 'Maestro has implemented the following server(s) for your' \
-          " blueprint '%s':",
-        blueprint
-      )
-      server_options = display_servers_with_ip(o_forge, s_msg)
-      s_msg += server_options[:message]
-      i_count = server_options[:count]
-      if i_count > 0
-        s_msg += format("\n%d server(s) identified.\n", i_count)
-      else
-        s_msg = 'No servers found except maestro'
-        PrcLib.warning('Something went wrong, while creating nodes for '\
-                       "blueprint '%s'. check maestro logs "\
-                       '(Usually /var/log/cloud-init.log).', blueprint)
-      end
+      s_msg += "\nMaestro has implemented the following server(s) for your"\
+               " blueprint '#{blueprint}':"
+      s_msg = display_servers_with_ip(o_forge, blueprint, s_msg)
     else
       s_msg += "\nMaestro has NOT implemented any servers, because you did" \
         ' not provided a blueprint. Connect to Maestro, and ask Maestro to' \
@@ -508,7 +517,7 @@ class ForjCoreProcess
     PrcLib.high_level_msg("\n%s\nEnjoy!\n", s_msg)
   end
 
-  def display_servers_with_ip(o_forge, s_msg)
+  def display_servers_with_ip(o_forge, blueprint, s_msg)
     i_count = 0
     o_forge[:servers].each do |_type, server|
       next if /^maestro\./ =~ server[:name]
@@ -521,8 +530,21 @@ class ForjCoreProcess
       end
       i_count += 1
     end
-    server_options = { :message => s_msg, :count => i_count }
-    server_options
+
+    if i_count > 0
+      s_msg += format("\n%d server(s) identified.\n", i_count)
+
+    else
+      s_msg = 'No servers found except maestro'
+      PrcLib.warning('Something went wrong, while creating nodes for blueprint'\
+                     " '#{blueprint}'. check maestro logs "\
+                     "(Usually /var/log/cloud-init.log).\n"\
+                     'Consider Lorj Gardener by setting :default/:lorj: '\
+                     'false in /opt/config/lorj/config.yaml if puppet'\
+                     ' returned some strange ruby error.')
+    end
+
+    s_msg
   end
 end
 
@@ -728,11 +750,14 @@ class ForjCoreProcess
     if b_rebuild_infra
       PrcLib.state("Building your infra workspace in '%s'", infra)
 
-      PrcLib.debug("Copying recursively '%s' to '%s'", cloud_init, infra)
-      FileUtils.copy_entry(cloud_init, dest_cloud_init)
+      if File.directory?(cloud_init)
+        PrcLib.debug("Copying recursively '%s' to '%s'", cloud_init, infra)
+        FileUtils.copy_entry(cloud_init, dest_cloud_init)
+      end
 
       file_ver = File.join(infra, 'forj-cli.ver')
       File.write(file_ver, INFRA_VERSION)
+      infra_cleanup(infra, maestro_repo)
       PrcLib.info("The infra workspace '%s' has been built from maestro" \
                   ' predefined files.', infra)
     else
@@ -744,19 +769,57 @@ class ForjCoreProcess
     o_infra
   end
 
-  def load_infra(template, dest_cloud_init, h_result, b_result)
+  # check from the list of files under maestro control
+  # Do cleanup for files that disappeared.
+  #
+  # Then it update the hidden maestro controlled file.
+  #
+  def infra_cleanup(infra_dir, maestro_dir)
+    md5_list_file = File.join(infra_dir, '.maestro_original.yaml')
+
+    md5_list = {}
+    md5_list = YAML.load_file(md5_list_file) if File.exist?(md5_list_file)
+
+    cur_md5_list = {}
+
+    template_dir = File.join(maestro_dir, 'templates', 'infra')
+    cloud_init_dir = File.join(infra_dir, 'cloud-init')
+
+    load_infra(template_dir, cloud_init_dir, cur_md5_list)
+
+    md5_list.each do |path, _md5|
+      if cur_md5_list.key?(path)
+        md5_list[path] = cur_md5_list[path]
+      else
+        begin
+          File.delete(File.join(template_dir, path))
+        rescue
+          PrcLib.debug("'%s' infra file has already been removed.", path)
+        else
+          PrcLib.debug("'%s' infra file has been removed.", path)
+        end
+        md5_list.delete(path)
+      end
+    end
+    infra_save_md5(md5_list_file, md5_list)
+  end
+
+  def load_infra(template, dest_cloud_init, md5_list, is_original = false)
     # We are taking care on bootstrap files only.
-    Find.find(File.join(template, 'cloud-init')) do |path|
-      # unless File.directory?(path)
+    cloud_init_path = File.join(template, 'cloud-init')
+    return is_original unless File.directory?(cloud_init_path)
+
+    Find.find(cloud_init_path) do |path|
       next if File.directory?(path)
+      file_original = true # By default we consider it to be original
       s_maestro_rel_path = path.clone
-      s_maestro_rel_path[File.join(template, 'cloud-init/')] = ''
+      s_maestro_rel_path[cloud_init_path + '/'] = ''
       s_infra_path = File.join(dest_cloud_init, s_maestro_rel_path)
       if File.exist?(s_infra_path)
         md5_file = Digest::MD5.file(s_infra_path).hexdigest
-        if h_result.key?(s_maestro_rel_path) &&
-           h_result[s_maestro_rel_path] != md5_file
-          b_result = false
+        if md5_list.key?(s_maestro_rel_path) &&
+           md5_list.rh_get(s_maestro_rel_path, :md5) != md5_file
+          file_original = false
           PrcLib.info("'%s' infra file has changed from original template" \
                       ' in maestro.', s_infra_path)
         else
@@ -764,49 +827,51 @@ class ForjCoreProcess
         end
       end
       md5_file = Digest::MD5.file(path).hexdigest
-      h_result[s_maestro_rel_path] = md5_file
-      # end
+      md5_list[s_maestro_rel_path] = { :md5 => md5_file,
+                                       :original => file_original }
+      is_original &= false
     end
-    b_result
+    is_original
   end
 
-  def open_md5(s_md5_list, h_result)
-    # begin
-    File.open(s_md5_list, 'w') do |out|
-      YAML.dump(h_result, out)
-    end
-    rescue => e
-      PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
-    # end
+  def infra_save_md5(md5_list_file, data)
+    File.open(md5_list_file, 'w') { |out| YAML.dump(data, out) }
+  rescue => e
+    PrcLib.error("File '%s': %s\n%s", md5_list_file, e.message,
+                 e.backtrace.join("\n"))
   end
 end
 
 # Functions for boot - create_or_use_infra
 class ForjCoreProcess
   # Function which compare directories from maestro templates to infra.
+  #
+  # * *return*:
+  #   - true if the infra repository file contains some files managed by maestro
+  #     which has not been updated manually.
+  #   - false otherwise.
   def infra_is_original?(infra_dir, maestro_dir)
     dest_cloud_init = File.join(infra_dir, 'cloud-init')
     template = File.join(maestro_dir, 'templates', 'infra')
     return false unless File.exist?(template)
     s_md5_list = File.join(infra_dir, '.maestro_original.yaml')
     b_result = true
-    h_result = {}
+    md5_list = {}
     if File.exist?(s_md5_list)
       begin
-        h_result = YAML.load_file(s_md5_list)
+        md5_list = YAML.load_file(s_md5_list)
      rescue
        PrcLib.error("Unable to load valid Original files list '%s'. " \
                     "Your infra workspace won't be migrated, until fixed.",
                     s_md5_list)
        b_result = false
       end
-      unless h_result
-        h_result = {}
+      unless md5_list
+        md5_list = {}
         b_result = false
       end
     end
-    b_result = load_infra(template, dest_cloud_init, h_result, b_result)
-    open_md5(s_md5_list, h_result)
+    b_result = load_infra(template, dest_cloud_init, md5_list, b_result)
     if b_result
       PrcLib.debug(
         'No original files found has been updated. Infra workspace' \

data/lib/process/forj_core/process/lorj_account.rb

@@ -21,25 +21,21 @@ require 'lorj'
 # lorj_account process functions
 class ForjCoreProcess
   def build_lorj_account(sObjectType, hParams)
-    data = {}
+    map = {}
+
+    Lorj.data.meta_each do |section, key, data|
+      section_key = "#{section}##{key}"
+
+      next if data.nil? || data[:export].nil?
 
-    map = {
-      'credentials#auth_uri'     => {},
-      'credentials#account_id'   => {},
-      'credentials#account_key'  => {},
-      'credentials#tenant'       => {},
-      'credentials#keypair_name' => {},
-      'services#compute'         => {},
-      'services#network'         => {},
-      'maestro#image_name'       => { :keys => [:server, :image_name] },
-      'maestro#ssh_user'         => { :keys => [:server, :ssh_user] },
-      'maestro#flavor_name'      => { :keys => [:server, :flavor_name] },
-      'maestro#network_name'     => { :keys => [:server, :network_name] },
-      'maestro#security_group'   => { :keys => [:server, :security_group] },
-      'dns#domain_name'          => {},
-      'network#webproxy'         => {}
-    }
+      if data[:export].boolean?
+        map[section_key] = {} if data[:export]
+        next
+      end
 
+      map[section_key] = { :keys => data[:export] }
+    end
+    data = {}
     data[:key], data[:data] = account_export(map, true, true,
                                              :exclude => ['forj_core'])
     data_registered = register(data, sObjectType)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement